Commit 0febcba8 authored by Stéphane Letz's avatar Stéphane Letz
Browse files

Merge pull request #195 from jmendeth/patch-3

Fix Netjack crashes due to broken alignment
parents 7bdad496 b4e7e875
...@@ -38,7 +38,7 @@ using namespace std; ...@@ -38,7 +38,7 @@ using namespace std;
#endif #endif
#endif #endif
#define NETWORK_PROTOCOL 8 #define NETWORK_PROTOCOL 9
#define NET_SYNCHING 0 #define NET_SYNCHING 0
#define SYNC_PACKET_ERROR -2 #define SYNC_PACKET_ERROR -2
...@@ -94,9 +94,9 @@ namespace Jack ...@@ -94,9 +94,9 @@ namespace Jack
char fPacketType[8]; //packet type ('param') char fPacketType[8]; //packet type ('param')
uint32_t fProtocolVersion; //version uint32_t fProtocolVersion; //version
int32_t fPacketID; //indicates the packet type int32_t fPacketID; //indicates the packet type
char fName[JACK_CLIENT_NAME_SIZE+1]; //slave's name char fName[JACK_CLIENT_NAME_SIZE+8]; //slave's name
char fMasterNetName[JACK_SERVER_NAME_SIZE+1]; //master hostname (network) char fMasterNetName[JACK_SERVER_NAME_SIZE+8]; //master hostname (network)
char fSlaveNetName[JACK_SERVER_NAME_SIZE+1]; //slave hostname (network) char fSlaveNetName[JACK_SERVER_NAME_SIZE+8]; //slave hostname (network)
uint32_t fMtu; //connection mtu uint32_t fMtu; //connection mtu
uint32_t fID; //slave's ID uint32_t fID; //slave's ID
uint32_t fTransportSync; //is the transport synced ? uint32_t fTransportSync; //is the transport synced ?
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment