From cfcafb25a32b194a55cfc42b42b376b2c6b58f3f Mon Sep 17 00:00:00 2001 From: Xavier Mendez Date: Fri, 11 Mar 2016 18:04:36 +0100 Subject: [PATCH 1/2] Fix Netjack alignment See discussion at http://comments.gmane.org/gmane.comp.audio.jackit/29516 --- common/JackNetTool.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/JackNetTool.h b/common/JackNetTool.h index 79c82f5c..a8334ccb 100644 --- a/common/JackNetTool.h +++ b/common/JackNetTool.h @@ -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 ? From b4e7e875a7243935389913d0ed3cf380d18d2647 Mon Sep 17 00:00:00 2001 From: Xavier Mendez Date: Fri, 11 Mar 2016 18:04:46 +0100 Subject: [PATCH 2/2] Bump Netjack protocol version --- common/JackNetTool.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/JackNetTool.h b/common/JackNetTool.h index a8334ccb..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