{"thread":{"id":"28563","subject":"[PATCH] daemon: log errors if we could not use some sockets","startedAt":"2011-10-03T19:13:28Z","lastAt":"2011-10-03T19:13:28Z","messageCount":1,"participants":["Nguyễn Thái Ngọc Duy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"176775","messageId":"1317669208-16340-1-git-send-email-pclouds@gmail.com","threadId":"28563","inReplyTo":null,"subject":"[PATCH] daemon: log errors if we could not use some sockets","fromName":"Nguyễn Thái Ngọc Duy","fromEmail":"pclouds@gmail.com","sentAt":"2011-10-03T19:13:28Z","receivedAt":"2011-10-03T19:13:28Z","isPatch":true,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"\nSigned-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>\n---\n daemon.c |   37 +++++++++++++++++++++++++++++++++++++\n 1 files changed, 37 insertions(+), 0 deletions(-)\n\ndiff --git a/daemon.c b/daemon.c\nindex cfd8cef..154d66e 100644\n--- a/daemon.c\n+++ b/daemon.c\n@@ -739,6 +739,29 @@ struct socketlist {\n \tsize_t alloc;\n };\n \n+static const char *ip2str(int family, struct sockaddr *sin, socklen_t len)\n+{\n+#ifdef NO_IPV6\n+\tstatic char ip[INET_ADDRSTRLEN];\n+#else\n+\tstatic char ip[INET6_ADDRSTRLEN];\n+#endif\n+\n+\tswitch (family) {\n+#ifndef NO_IPV6\n+\tcase AF_INET6:\n+\t\tinet_ntop(family, &((struct sockaddr_in6*)sin)->sin6_addr, ip, len);\n+\t\tbreak;\n+#endif\n+\tcase AF_INET:\n+\t\tinet_ntop(family, &((struct sockaddr_in*)sin)->sin_addr, ip, len);\n+\t\tbreak;\n+\tdefault:\n+\t\tstrcpy(ip, \"<unknown>\");\n+\t}\n+\treturn ip;\n+}\n+\n #ifndef NO_IPV6\n \n static int setup_named_sock(char *listen_addr, int listen_port, struct socketlist *socklist)\n@@ -785,15 +808,22 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis\n #endif\n \n \t\tif (set_reuse_addr(sockfd)) {\n+\t\t\tlogerror(\"Could not set SO_REUSEADDR: %s\", strerror(errno));\n \t\t\tclose(sockfd);\n \t\t\tcontinue;\n \t\t}\n \n \t\tif (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) {\n+\t\t\tlogerror(\"Could not bind to %s: %s\",\n+\t\t\t\t ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),\n+\t\t\t\t strerror(errno));\n \t\t\tclose(sockfd);\n \t\t\tcontinue;\t/* not fatal */\n \t\t}\n \t\tif (listen(sockfd, 5) < 0) {\n+\t\t\tlogerror(\"Could not listen to %s: %s\",\n+\t\t\t\t ip2str(ai->ai_family, ai->ai_addr, ai->ai_addrlen),\n+\t\t\t\t strerror(errno));\n \t\t\tclose(sockfd);\n \t\t\tcontinue;\t/* not fatal */\n \t\t}\n@@ -840,16 +870,23 @@ static int setup_named_sock(char *listen_addr, int listen_port, struct socketlis\n \t\treturn 0;\n \n \tif (set_reuse_addr(sockfd)) {\n+\t\tlogerror(\"Could not set SO_REUSEADDR: %s\", strerror(errno));\n \t\tclose(sockfd);\n \t\treturn 0;\n \t}\n \n \tif ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) {\n+\t\tlogerror(\"Could not listen to %s: %s\",\n+\t\t\t ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),\n+\t\t\t strerror(errno));\n \t\tclose(sockfd);\n \t\treturn 0;\n \t}\n \n \tif (listen(sockfd, 5) < 0) {\n+\t\tlogerror(\"Could not listen to %s: %s\",\n+\t\t\t ip2str(AF_INET, (struct sockaddr *)&sin, sizeof(sin)),\n+\t\t\t strerror(errno));\n \t\tclose(sockfd);\n \t\treturn 0;\n \t}\n-- \n1.7.3.1.256.g2539c.dirty\n"}]}