Author: cazfi Date: Sun Mar 15 08:39:06 2015 New Revision: 28555 URL: http://svn.gna.org/viewcvs/freeciv?rev=28555&view=rev Log: Added some context to every client error_func() logging call about LAN announcements.
See patch #5865 Modified: branches/S2_5/client/servers.c Modified: branches/S2_5/client/servers.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/servers.c?rev=28555&r1=28554&r2=28555&view=diff ============================================================================== --- branches/S2_5/client/servers.c (original) +++ branches/S2_5/client/servers.c Sun Mar 15 08:39:06 2015 @@ -475,7 +475,13 @@ /* Create a socket for listening for server packets. */ if ((scan->sock = socket(family, SOCK_DGRAM, 0)) < 0) { - scan->error_func(scan, fc_strerror(fc_get_errno())); + char errstr[2048]; + + fc_snprintf(errstr, sizeof(errstr), + _("Opening socket to listen LAN announcements failed:\n%s"), + fc_strerror(fc_get_errno())); + scan->error_func(scan, errstr); + return FALSE; } @@ -509,7 +515,13 @@ } if (bind(scan->sock, &addr.saddr, sockaddr_size(&addr)) < 0) { - scan->error_func(scan, fc_strerror(fc_get_errno())); + char errstr[2048]; + + fc_snprintf(errstr, sizeof(errstr), + _("Binding socket to listen LAN announcements failed:\n%s"), + fc_strerror(fc_get_errno())); + scan->error_func(scan, errstr); + return FALSE; } @@ -527,7 +539,12 @@ if (setsockopt(scan->sock, IPPROTO_IPV6, FC_IPV6_ADD_MEMBERSHIP, (const char*)&mreq6, sizeof(mreq6)) < 0) { - scan->error_func(scan, fc_strerror(fc_get_errno())); + char errstr[2048]; + + fc_snprintf(errstr, sizeof(errstr), + _("Adding membership for IPv6 LAN announcement group failed:\n%s"), + fc_strerror(fc_get_errno())); + scan->error_func(scan, errstr); } } else { inet_pton(AF_INET, group, &mreq4.imr_multiaddr.s_addr); @@ -536,7 +553,13 @@ if (setsockopt(scan->sock, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const char*)&mreq4, sizeof(mreq4)) < 0) { - scan->error_func(scan, fc_strerror(fc_get_errno())); + char errstr[2048]; + + fc_snprintf(errstr, sizeof(errstr), + _("Adding membership for IPv4 LAN announcement group failed:\n%s"), + fc_strerror(fc_get_errno())); + scan->error_func(scan, errstr); + return FALSE; } } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits