Author: cazfi Date: Mon Mar 2 20:17:13 2015 New Revision: 28359 URL: http://svn.gna.org/viewcvs/freeciv?rev=28359&view=rev Log: Added some context to every client error_func() logging call about LAN announcements.
See patch #5865 Modified: trunk/client/servers.c Modified: trunk/client/servers.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/servers.c?rev=28359&r1=28358&r2=28359&view=diff ============================================================================== --- trunk/client/servers.c (original) +++ trunk/client/servers.c Mon Mar 2 20:17:13 2015 @@ -446,7 +446,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; } @@ -480,7 +486,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; } @@ -491,7 +503,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 #endif /* IPv6 support */ @@ -501,7 +518,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