diff options
| author | Stéphane Letz <letz@grame.fr> | 2016-03-18 10:36:05 +0100 |
|---|---|---|
| committer | Stéphane Letz <letz@grame.fr> | 2016-03-18 10:36:05 +0100 |
| commit | 0febcba8230ec089f389e1731ef0a2cb484aebdf (patch) | |
| tree | 52ca32dca260df9138c202f7d35f05fc5f92234f | |
| parent | 7bdad4966b29f721c384bdfe6921a1e5c1d84561 (diff) | |
| parent | b4e7e875a7243935389913d0ed3cf380d18d2647 (diff) | |
| download | jack2-0febcba8230ec089f389e1731ef0a2cb484aebdf.tar.gz | |
Merge pull request #195 from jmendeth/patch-3
Fix Netjack crashes due to broken alignment
| -rw-r--r-- | common/JackNetTool.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/JackNetTool.h b/common/JackNetTool.h index 79c82f5c..d8bc6df9 100644 --- a/common/JackNetTool.h +++ b/common/JackNetTool.h @@ -38,7 +38,7 @@ using namespace std; #endif #endif -#define NETWORK_PROTOCOL 8 +#define NETWORK_PROTOCOL 9 #define NET_SYNCHING 0 #define SYNC_PACKET_ERROR -2 @@ -94,9 +94,9 @@ namespace Jack char fPacketType[8]; //packet type ('param') uint32_t fProtocolVersion; //version int32_t fPacketID; //indicates the packet type - char fName[JACK_CLIENT_NAME_SIZE+1]; //slave's name - char fMasterNetName[JACK_SERVER_NAME_SIZE+1]; //master hostname (network) - char fSlaveNetName[JACK_SERVER_NAME_SIZE+1]; //slave hostname (network) + char fName[JACK_CLIENT_NAME_SIZE+8]; //slave's name + char fMasterNetName[JACK_SERVER_NAME_SIZE+8]; //master hostname (network) + char fSlaveNetName[JACK_SERVER_NAME_SIZE+8]; //slave hostname (network) uint32_t fMtu; //connection mtu uint32_t fID; //slave's ID uint32_t fTransportSync; //is the transport synced ? |