Author: cazfi
Date: Tue Mar 24 23:29:07 2015
New Revision: 28613
URL: http://svn.gna.org/viewcvs/freeciv?rev=28613&view=rev
Log:
Made network packet type field 8bit wide.
See patch #5829
Modified:
branches/S2_6/common/packets.c
branches/S2_6/doc/HACKING
branches/S2_6/fc_version
Modified: branches/S2_6/common/packets.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.c?rev=28613&r1=28612&r2=28613&view=diff
==============================================================================
--- branches/S2_6/common/packets.c (original)
+++ branches/S2_6/common/packets.c Tue Mar 24 23:29:07 2015
@@ -615,7 +615,7 @@
fc_assert(packet_header->type == DIOT_UINT8);
packet_header->length = DIOT_UINT16;
- packet_header->type = DIOT_UINT16;
+ packet_header->type = DIOT_UINT8;
}
/****************************************************************************
Modified: branches/S2_6/doc/HACKING
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/doc/HACKING?rev=28613&r1=28612&r2=28613&view=diff
==============================================================================
--- branches/S2_6/doc/HACKING (original)
+++ branches/S2_6/doc/HACKING Tue Mar 24 23:29:07 2015
@@ -178,10 +178,12 @@
A packet is constituted by header followed by the serialized structure
data. The header contains the following fields (the sizes are defined in
-common/packets.c:packet_header_set()):
+common/packets.c:packet_header_set()). Currently this header is
+identical to one used in initial handshake protocol, but this can
+change in future versions.
uint16 : length (the length of the entire packet)
-uint16 : type (e.g. PACKET_TILE_INFO)
+uint8 : type (e.g. PACKET_TILE_INFO)
For backward compatibility reasons, packets used for the initial protocol
(notably before checking the capabilities) have different header fields
Modified: branches/S2_6/fc_version
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/fc_version?rev=28613&r1=28612&r2=28613&view=diff
==============================================================================
--- branches/S2_6/fc_version (original)
+++ branches/S2_6/fc_version Tue Mar 24 23:29:07 2015
@@ -54,7 +54,7 @@
# - Avoid adding a new mandatory capability to the development branch for
# as long as possible. We want to maintain network compatibility with
# the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2015.Mar.13"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-2.6-2015.Mar.22"
NETWORK_CAPSTRING_OPTIONAL=""
FREECIV_DISTRIBUTOR=""
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
