Author: cazfi
Date: Fri Feb 27 21:12:25 2015
New Revision: 28325
URL: http://svn.gna.org/viewcvs/freeciv?rev=28325&view=rev
Log:
Removed unused binary "type" field from raw-protocol header under json-protocol
See patch #5851
Modified:
trunk/common/packets_json.c
trunk/common/packets_json.h
Modified: trunk/common/packets_json.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets_json.c?rev=28325&r1=28324&r2=28325&view=diff
==============================================================================
--- trunk/common/packets_json.c (original)
+++ trunk/common/packets_json.c Fri Feb 27 21:12:25 2015
@@ -326,7 +326,7 @@
/* Parse JSON packet. */
- pc->json_packet = json_loadb((char*)pc->buffer->data + 4, whole_packet_len,
0, &error);
+ pc->json_packet = json_loadb((char*)pc->buffer->data + 2, whole_packet_len,
0, &error);
memmove(pc->buffer->data, pc->buffer->data, pc->buffer->ndata);
pc->buffer->ndata = 0;
Modified: trunk/common/packets_json.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets_json.h?rev=28325&r1=28324&r2=28325&view=diff
==============================================================================
--- trunk/common/packets_json.h (original)
+++ trunk/common/packets_json.h Fri Feb 27 21:12:25 2015
@@ -30,7 +30,6 @@
\
dio_output_init(&(dout.raw), buffer, sizeof(buffer)); \
dio_put_uint16_raw(&(dout.raw), 0); \
- dio_put_uint16_raw(&(dout.raw), packet_type); \
dio_put_uint8_json(&dout, "pid", packet_type);
#define SEND_PACKET_END(packet_type) \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
