Author: cazfi
Date: Mon Aug 25 02:32:46 2014
New Revision: 26026
URL: http://svn.gna.org/viewcvs/freeciv?rev=26026&view=rev
Log:
sockaddr_debug() takes the logging level as parameter.
See patch #5065
Modified:
trunk/server/sernet.c
trunk/utility/netintf.c
trunk/utility/netintf.h
Modified: trunk/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=26026&r1=26025&r2=26026&view=diff
==============================================================================
--- trunk/server/sernet.c (original)
+++ trunk/server/sernet.c Mon Aug 25 02:32:46 2014
@@ -1133,7 +1133,7 @@
(char *)&on, sizeof(on)) == -1) {
log_error("setsockopt IPV6_V6ONLY failed: %s",
fc_strerror(fc_get_errno()));
- sockaddr_debug(paddr);
+ sockaddr_debug(paddr, LOG_DEBUG);
}
#endif /* IPV6_V6ONLY */
}
@@ -1177,7 +1177,7 @@
if (listen_count == 0) {
log_fatal("%s failed: %s", cause, fc_strerror(eno));
fc_sockaddr_list_iterate(list, paddr) {
- sockaddr_debug(paddr);
+ sockaddr_debug(paddr, LOG_DEBUG);
} fc_sockaddr_list_iterate_end;
exit(EXIT_FAILURE);
}
Modified: trunk/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=26026&r1=26025&r2=26026&view=diff
==============================================================================
--- trunk/utility/netintf.c (original)
+++ trunk/utility/netintf.c Mon Aug 25 02:32:46 2014
@@ -257,20 +257,20 @@
/***************************************************************************
Write information about socaddr to debug log.
***************************************************************************/
-void sockaddr_debug(union fc_sockaddr *addr)
+void sockaddr_debug(union fc_sockaddr *addr, enum log_level lvl)
{
#ifdef IPV6_SUPPORT
char buf[INET6_ADDRSTRLEN] = "Unknown";
if (addr->saddr.sa_family == AF_INET6) {
inet_ntop(AF_INET6, &addr->saddr_in6.sin6_addr, buf, INET6_ADDRSTRLEN);
- log_debug("Host: %s, Port: %d (IPv6)",
- buf, ntohs(addr->saddr_in6.sin6_port));
+ log_base(lvl, "Host: %s, Port: %d (IPv6)",
+ buf, ntohs(addr->saddr_in6.sin6_port));
return;
} else if (addr->saddr.sa_family == AF_INET) {
inet_ntop(AF_INET, &addr->saddr_in4.sin_addr, buf, INET_ADDRSTRLEN);
- log_debug("Host: %s, Port: %d (IPv4)",
- buf, ntohs(addr->saddr_in4.sin_port));
+ log_base(lvl, "Host: %s, Port: %d (IPv4)",
+ buf, ntohs(addr->saddr_in4.sin_port));
return;
}
#else /* IPv6 support */
@@ -279,8 +279,8 @@
buf = inet_ntoa(addr->saddr_in4.sin_addr);
- log_debug("Host: %s, Port: %d",
- buf, ntohs(addr->saddr_in4.sin_port));
+ log_base(lvl, "Host: %s, Port: %d",
+ buf, ntohs(addr->saddr_in4.sin_port));
return;
}
Modified: trunk/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.h?rev=26026&r1=26025&r2=26026&view=diff
==============================================================================
--- trunk/utility/netintf.h (original)
+++ trunk/utility/netintf.h Mon Aug 25 02:32:46 2014
@@ -129,7 +129,7 @@
int find_next_free_port(int starting_port, enum fc_addr_family family,
char *net_interface, bool not_avail_ok);
-void sockaddr_debug(union fc_sockaddr *addr);
+void sockaddr_debug(union fc_sockaddr *addr, enum log_level lvl);
int sockaddr_size(union fc_sockaddr *addr);
bool sockaddr_ipv6(union fc_sockaddr *addr);
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
