[Freeciv-Dev] Re: (PR#7070) Small Delta bug

["Raimar Falke" <i-freeciv-lists@xxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=7070 >

On Mon, Dec 08, 2003 at 08:30:13PM -0800, Michael Kirzinger wrote:
> 
> <URL: http://rt.freeciv.org/Ticket/Display.html?id=7070 >
> 
> In /freeciv/source/client/packhand.c, handle_server_join_reply, when
> joining a server, the value of conn_id is incorrect. From what I have
> observed, it always is equal to 255 instead of the id for the specific
> connection.
> 
> A result of this bug is that in handle_conn_info, aconnection.establish,
> aconnection.observer, aconnection.access_level, etc. is not set when
> connecting to a server. These are all skipped because pinfo->id is never
> equal to aconnection.id as it is incorrectly set in
> handle_server_join_reply.
> 
> This happens always (for me) in the current CVS. This bug was introduced
> by the delta patch.

I applied the obvious one-liner.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The Internet is really just a series of bottlenecks 
  joined by high speed networks."
    -- Sam Wilson

Index: server/connecthand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/connecthand.c,v
retrieving revision 1.16
diff -u -u -r1.16 connecthand.c
--- server/connecthand.c        2003/11/28 17:37:22     1.16
+++ server/connecthand.c        2003/12/15 21:19:23
@@ -90,7 +90,7 @@
   sz_strlcpy(packet.capability, our_capability);
   my_snprintf(packet.message, sizeof(packet.message), _("%s Welcome"),
               pconn->username);
-  packet.conn_id = -1;
+  packet.conn_id = pconn->id;
   send_packet_server_join_reply(pconn, &packet);
 
   /* "establish" the connection */