From c716c75d4bfb56baff70cfc66e7ef1d91754ac4a Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 23 Oct 2009 09:02:30 +0000 Subject: [PATCH] Correct JACK_MESSAGE_SIZE value, particularly in OSX RPC code. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3661 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 1 + common/JackConstants.h | 2 +- macosx/JackMachServerChannel.h | 2 +- macosx/RPC/JackRPCClient.defs | 5 +- macosx/RPC/JackRPCClientServer.c | 58 ++++++++++----------- macosx/RPC/JackRPCClientUser.c | 10 ++-- macosx/RPC/JackRPCEngine.defs | 6 +-- macosx/RPC/JackRPCEngineServer.c | 86 ++++++++++++++++---------------- macosx/RPC/JackRPCEngineUser.c | 42 ++++++++-------- macosx/RPC/Jackdefs.h | 8 +-- macosx/coreaudio/JackCoreAudioDriver.cpp | 4 +- 11 files changed, 112 insertions(+), 112 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3354e88f..82d34452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ Paul Davis 2009-10-22 Stephane Letz * Correct JackProcessSync::LockedTimedWait. + * Correct JACK_MESSAGE_SIZE value, particularly in OSX RPC code. 2009-10-22 Stephane Letz diff --git a/common/JackConstants.h b/common/JackConstants.h index 9b4ef3b0..00a0be99 100644 --- a/common/JackConstants.h +++ b/common/JackConstants.h @@ -32,7 +32,7 @@ #define JACK_PORT_TYPE_SIZE 32 #define JACK_CLIENT_NAME_SIZE 64 -#define JACK_MESSAGE_SIZE 512 +#define JACK_MESSAGE_SIZE 256 #ifndef PORT_NUM #define PORT_NUM 2048 diff --git a/macosx/JackMachServerChannel.h b/macosx/JackMachServerChannel.h index 9e5ac35f..fc9a062d 100644 --- a/macosx/JackMachServerChannel.h +++ b/macosx/JackMachServerChannel.h @@ -53,7 +53,7 @@ class JackMachServerChannel : public JackRunnableInterface int Open(const char* server_name, JackServer* server); // Open the Server/Client connection void Close(); // Close the Server/Client connection - + JackLockedEngine* GetEngine(); JackServer* GetServer(); diff --git a/macosx/RPC/JackRPCClient.defs b/macosx/RPC/JackRPCClient.defs index 4457cc20..3c3eb515 100644 --- a/macosx/RPC/JackRPCClient.defs +++ b/macosx/RPC/JackRPCClient.defs @@ -24,9 +24,8 @@ subsystem JackRPCClient 1000; import "Jackdefs.h"; waittime 5000; -type client_name_t = c_string[128]; -type client_port_name_t = c_string[128]; -type message_t = c_string[512]; +type client_name_t = c_string[64]; +type message_t = c_string[256]; routine rpc_jack_client_sync_notify( client_port : mach_port_t; diff --git a/macosx/RPC/JackRPCClientServer.c b/macosx/RPC/JackRPCClientServer.c index eaff1832..7f5af274 100644 --- a/macosx/RPC/JackRPCClientServer.c +++ b/macosx/RPC/JackRPCClientServer.c @@ -1,6 +1,6 @@ /* * IDENTIFICATION: - * stub generated Tue Oct 20 12:13:25 2009 + * stub generated Fri Oct 23 10:35:08 2009 * with a MiG generated Mon May 18 09:59:33 PDT 2009 by root@sulitlana.apple.com * OPTIONS: */ @@ -226,11 +226,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__int_rep__JackRPCClient__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__int_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined */ @@ -266,11 +266,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__int_rep__JackRPCClient__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__int_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__int_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__int_rep__string(a, f, 512) + __NDR_convert__int_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_sync_notify_t__message__defined */ @@ -346,11 +346,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__char_rep__JackRPCClient__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__char_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined */ @@ -386,11 +386,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__char_rep__JackRPCClient__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__char_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__char_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__char_rep__string(a, f, 512) + __NDR_convert__char_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_sync_notify_t__message__defined */ @@ -466,11 +466,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__float_rep__JackRPCClient__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__float_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__client_name__defined */ @@ -506,11 +506,11 @@ mig_internal novalue _Xrpc_jack_client_async_notify #elif defined(__NDR_convert__float_rep__JackRPCClient__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__float_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__float_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__message__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__message(a, f) \ - __NDR_convert__float_rep__string(a, f, 512) + __NDR_convert__float_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_sync_notify_t__message__defined */ @@ -570,10 +570,10 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_sync_notify_t(_ char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! - memchr_limit = min((msg_limit - In0P->message), 512); + memchr_limit = min((msg_limit - In0P->message), 256); if (( memchr(In0P->message, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } @@ -784,11 +784,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__int_rep__JackRPCClient__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__int_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__client_name__defined */ @@ -824,11 +824,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__int_rep__JackRPCClient__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__int_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__int_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__int_rep__string(a, f, 512) + __NDR_convert__int_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_async_notify_t__message__defined */ @@ -904,11 +904,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__char_rep__JackRPCClient__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__char_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__client_name__defined */ @@ -944,11 +944,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__char_rep__JackRPCClient__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__char_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__char_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__char_rep__string(a, f, 512) + __NDR_convert__char_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_async_notify_t__message__defined */ @@ -1024,11 +1024,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__float_rep__JackRPCClient__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCClient__string(a, f, 128) + __NDR_convert__float_rep__JackRPCClient__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__client_name__defined */ @@ -1064,11 +1064,11 @@ mig_internal novalue _Xrpc_jack_client_sync_notify #elif defined(__NDR_convert__float_rep__JackRPCClient__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__float_rep__JackRPCClient__string(a, f, 512) + __NDR_convert__float_rep__JackRPCClient__string(a, f, 256) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__message__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__message(a, f) \ - __NDR_convert__float_rep__string(a, f, 512) + __NDR_convert__float_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_async_notify_t__message__defined */ @@ -1128,10 +1128,10 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_async_notify_t( char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! - memchr_limit = min((msg_limit - In0P->message), 512); + memchr_limit = min((msg_limit - In0P->message), 256); if (( memchr(In0P->message, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } diff --git a/macosx/RPC/JackRPCClientUser.c b/macosx/RPC/JackRPCClientUser.c index cbb184db..e6fef35e 100644 --- a/macosx/RPC/JackRPCClientUser.c +++ b/macosx/RPC/JackRPCClientUser.c @@ -1,6 +1,6 @@ /* * IDENTIFICATION: - * stub generated Tue Oct 20 12:13:25 2009 + * stub generated Fri Oct 23 10:35:08 2009 * with a MiG generated Mon May 18 09:59:33 PDT 2009 by root@sulitlana.apple.com * OPTIONS: */ @@ -342,11 +342,11 @@ mig_external kern_return_t rpc_jack_client_sync_notify InP->refnum = refnum; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); InP->notify = notify; - (void) mig_strncpy(InP->message, message, 512); + (void) mig_strncpy(InP->message, message, 256); InP->value1 = value1; @@ -438,11 +438,11 @@ mig_external kern_return_t rpc_jack_client_async_notify InP->refnum = refnum; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); InP->notify = notify; - (void) mig_strncpy(InP->message, message, 512); + (void) mig_strncpy(InP->message, message, 256); InP->value1 = value1; diff --git a/macosx/RPC/JackRPCEngine.defs b/macosx/RPC/JackRPCEngine.defs index 63500f41..468b3775 100644 --- a/macosx/RPC/JackRPCEngine.defs +++ b/macosx/RPC/JackRPCEngine.defs @@ -25,11 +25,11 @@ import "Jackdefs.h"; ServerPrefix server_; -type client_name_t = c_string[128]; +type client_name_t = c_string[64]; type client_port_name_t = c_string[128]; type client_port_type_t = c_string[128]; -type so_name_t = c_string[1024]; -type objet_data_t = c_string[1024]; +type so_name_t = c_string[256]; +type objet_data_t = c_string[256]; routine rpc_jack_client_open( server_port : mach_port_t; diff --git a/macosx/RPC/JackRPCEngineServer.c b/macosx/RPC/JackRPCEngineServer.c index 345edb7a..7ef5d556 100644 --- a/macosx/RPC/JackRPCEngineServer.c +++ b/macosx/RPC/JackRPCEngineServer.c @@ -1,6 +1,6 @@ /* * IDENTIFICATION: - * stub generated Tue Oct 20 12:13:26 2009 + * stub generated Fri Oct 23 10:35:08 2009 * with a MiG generated Mon May 18 09:59:33 PDT 2009 by root@sulitlana.apple.com * OPTIONS: */ @@ -791,11 +791,11 @@ mig_internal novalue _Xrpc_jack_client_rt_notify #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_open_t__client_name__defined */ @@ -831,11 +831,11 @@ mig_internal novalue _Xrpc_jack_client_rt_notify #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_open_t__client_name__defined */ @@ -871,11 +871,11 @@ mig_internal novalue _Xrpc_jack_client_rt_notify #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_open_t__client_name__defined */ @@ -915,7 +915,7 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_open_t(__attrib char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } @@ -1075,11 +1075,11 @@ mig_internal novalue _Xrpc_jack_client_open #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_client_check_t__client_name__defined */ @@ -1135,11 +1135,11 @@ mig_internal novalue _Xrpc_jack_client_open #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_client_check_t__client_name__defined */ @@ -1195,11 +1195,11 @@ mig_internal novalue _Xrpc_jack_client_open #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_client_check_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_client_check_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_client_check_t__client_name__defined */ @@ -1259,7 +1259,7 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_client_check_t(__attri char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } @@ -5427,11 +5427,11 @@ mig_internal novalue _Xrpc_jack_get_internal_clientname #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined */ @@ -5467,11 +5467,11 @@ mig_internal novalue _Xrpc_jack_get_internal_clientname #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined */ @@ -5507,11 +5507,11 @@ mig_internal novalue _Xrpc_jack_get_internal_clientname #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clienthandle_t__client_name__defined */ @@ -5531,7 +5531,7 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clienthandle_ char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } @@ -5688,11 +5688,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__client_name__defined */ @@ -5708,11 +5708,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__int_rep__string(a, f, 1024) + __NDR_convert__int_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__so_name__defined */ @@ -5728,11 +5728,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__int_rep__string(a, f, 1024) + __NDR_convert__int_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined */ @@ -5788,11 +5788,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__client_name__defined */ @@ -5808,11 +5808,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__char_rep__string(a, f, 1024) + __NDR_convert__char_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__so_name__defined */ @@ -5828,11 +5828,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__char_rep__string(a, f, 1024) + __NDR_convert__char_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined */ @@ -5888,11 +5888,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__client_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__client_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__client_name__defined */ @@ -5908,11 +5908,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__so_name__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__so_name(a, f) \ - __NDR_convert__float_rep__string(a, f, 1024) + __NDR_convert__float_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__so_name__defined */ @@ -5928,11 +5928,11 @@ mig_internal novalue _Xrpc_jack_internal_clienthandle #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 1024) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 256) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined #define __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__objet_data(a, f) \ - __NDR_convert__float_rep__string(a, f, 1024) + __NDR_convert__float_rep__string(a, f, 256) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Request__rpc_jack_internal_clientload_t__objet_data__defined */ @@ -5972,13 +5972,13 @@ mig_internal kern_return_t __MIG_check__Request__rpc_jack_internal_clientload_t( char * msg_limit = ((char *) In0P) + In0P->Head.msgh_size; size_t memchr_limit; - memchr_limit = min((msg_limit - In0P->client_name), 128); + memchr_limit = min((msg_limit - In0P->client_name), 64); if (( memchr(In0P->client_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! - memchr_limit = min((msg_limit - In0P->so_name), 1024); + memchr_limit = min((msg_limit - In0P->so_name), 256); if (( memchr(In0P->so_name, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! - memchr_limit = min((msg_limit - In0P->objet_data), 1024); + memchr_limit = min((msg_limit - In0P->objet_data), 256); if (( memchr(In0P->objet_data, '\0', memchr_limit) == NULL )) return MIG_BAD_ARGUMENTS; // string length exceeds buffer length! } diff --git a/macosx/RPC/JackRPCEngineUser.c b/macosx/RPC/JackRPCEngineUser.c index 7841c037..e86e8cfc 100644 --- a/macosx/RPC/JackRPCEngineUser.c +++ b/macosx/RPC/JackRPCEngineUser.c @@ -1,6 +1,6 @@ /* * IDENTIFICATION: - * stub generated Tue Oct 20 12:13:26 2009 + * stub generated Fri Oct 23 10:35:08 2009 * with a MiG generated Mon May 18 09:59:33 PDT 2009 by root@sulitlana.apple.com * OPTIONS: */ @@ -561,7 +561,7 @@ mig_external kern_return_t rpc_jack_client_open InP->NDR = NDR_record; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); InP->pid = pid; @@ -628,11 +628,11 @@ mig_external kern_return_t rpc_jack_client_open #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__int_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__int_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Reply__rpc_jack_client_check_t__client_name_res__defined */ @@ -692,11 +692,11 @@ mig_external kern_return_t rpc_jack_client_open #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__char_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__char_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Reply__rpc_jack_client_check_t__client_name_res__defined */ @@ -756,11 +756,11 @@ mig_external kern_return_t rpc_jack_client_open #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__float_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Reply__rpc_jack_client_check_t__client_name_res__defined #define __NDR_convert__float_rep__Reply__rpc_jack_client_check_t__client_name_res(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Reply__rpc_jack_client_check_t__client_name_res__defined */ @@ -983,7 +983,7 @@ mig_external kern_return_t rpc_jack_client_check InP->NDR = NDR_record; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); InP->protocol = protocol; @@ -1011,7 +1011,7 @@ mig_external kern_return_t rpc_jack_client_check { return check_result; } #endif /* defined(__MIG_check__Reply__rpc_jack_client_check_t__defined) */ - (void) mig_strncpy(client_name_res, Out0P->client_name_res, 128); + (void) mig_strncpy(client_name_res, Out0P->client_name_res, 64); *status = Out0P->status; @@ -4739,11 +4739,11 @@ mig_external kern_return_t rpc_jack_set_timebase_callback #elif defined(__NDR_convert__int_rep__JackRPCEngine__string__defined) #define __NDR_convert__int_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__int_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__int_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__int_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__int_rep__string__defined) #define __NDR_convert__int_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__int_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__int_rep__string(a, f, 128) + __NDR_convert__int_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__int_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined */ @@ -4782,11 +4782,11 @@ mig_external kern_return_t rpc_jack_set_timebase_callback #elif defined(__NDR_convert__char_rep__JackRPCEngine__string__defined) #define __NDR_convert__char_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__char_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__char_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__char_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__char_rep__string__defined) #define __NDR_convert__char_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__char_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__char_rep__string(a, f, 128) + __NDR_convert__char_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__char_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined */ @@ -4825,11 +4825,11 @@ mig_external kern_return_t rpc_jack_set_timebase_callback #elif defined(__NDR_convert__float_rep__JackRPCEngine__string__defined) #define __NDR_convert__float_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__float_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__float_rep__JackRPCEngine__string(a, f, 128) + __NDR_convert__float_rep__JackRPCEngine__string(a, f, 64) #elif defined(__NDR_convert__float_rep__string__defined) #define __NDR_convert__float_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined #define __NDR_convert__float_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res(a, f) \ - __NDR_convert__float_rep__string(a, f, 128) + __NDR_convert__float_rep__string(a, f, 64) #endif /* defined(__NDR_convert__*__defined) */ #endif /* __NDR_convert__float_rep__Reply__rpc_jack_get_internal_clientname_t__client_name_res__defined */ @@ -5040,7 +5040,7 @@ mig_external kern_return_t rpc_jack_get_internal_clientname { return check_result; } #endif /* defined(__MIG_check__Reply__rpc_jack_get_internal_clientname_t__defined) */ - (void) mig_strncpy(client_name_res, Out0P->client_name_res, 128); + (void) mig_strncpy(client_name_res, Out0P->client_name_res, 64); *result = Out0P->result; @@ -5431,7 +5431,7 @@ mig_external kern_return_t rpc_jack_internal_clienthandle InP->refnum = refnum; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); InP->Head.msgh_bits = MACH_MSGH_BITS(19, MACH_MSG_TYPE_MAKE_SEND_ONCE); @@ -5854,11 +5854,11 @@ mig_external kern_return_t rpc_jack_internal_clientload InP->refnum = refnum; - (void) mig_strncpy(InP->client_name, client_name, 128); + (void) mig_strncpy(InP->client_name, client_name, 64); - (void) mig_strncpy(InP->so_name, so_name, 1024); + (void) mig_strncpy(InP->so_name, so_name, 256); - (void) mig_strncpy(InP->objet_data, objet_data, 1024); + (void) mig_strncpy(InP->objet_data, objet_data, 256); InP->options = options; diff --git a/macosx/RPC/Jackdefs.h b/macosx/RPC/Jackdefs.h index 29dd4860..5e73d984 100644 --- a/macosx/RPC/Jackdefs.h +++ b/macosx/RPC/Jackdefs.h @@ -18,8 +18,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ typedef char client_name_t[64]; -typedef char client_port_name_t[256]; +typedef char client_port_name_t[128]; typedef char client_port_type_t[128]; -typedef char so_name_t[1024]; -typedef char objet_data_t[1024]; -typedef char message_t[512]; +typedef char so_name_t[256]; +typedef char objet_data_t[256]; +typedef char message_t[256]; diff --git a/macosx/coreaudio/JackCoreAudioDriver.cpp b/macosx/coreaudio/JackCoreAudioDriver.cpp index 84b0ff51..d690f94d 100644 --- a/macosx/coreaudio/JackCoreAudioDriver.cpp +++ b/macosx/coreaudio/JackCoreAudioDriver.cpp @@ -271,7 +271,7 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice, case kAudioDevicePropertyStreamConfiguration: { jack_error("Cannot handle kAudioDevicePropertyStreamConfiguration : server will quit..."); - driver->NotifyFailure(JackBackendError, "Another application has changed the device configuration."); + driver->NotifyFailure(JackBackendError, "Another application has changed the device configuration."); // Message length limited to JACK_MESSAGE_SIZE driver->CloseAUHAL(); kill(JackTools::GetPID(), SIGINT); return kAudioHardwareUnsupportedOperationError; @@ -279,7 +279,7 @@ OSStatus JackCoreAudioDriver::DeviceNotificationCallback(AudioDeviceID inDevice, case kAudioDevicePropertyNominalSampleRate: { jack_error("Cannot handle kAudioDevicePropertyNominalSampleRate : server will quit..."); - driver->NotifyFailure(JackBackendError, "Another application has changed the sample rate."); + driver->NotifyFailure(JackBackendError, "Another application has changed the sample rate."); // Message length limited to JACK_MESSAGE_SIZE driver->CloseAUHAL(); kill(JackTools::GetPID(), SIGINT); return kAudioHardwareUnsupportedOperationError; -- 2.11.4.GIT