Merge pull request #219 from kronosnet/udp

udp fixes
kronosnet · May 2, 2019 · b85607a · b85607a
2 parents 8269137 + 6f7a014
commit b85607a
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/libknet/transport_udp.c b/libknet/transport_udp.c
@@ -296,6 +296,8 @@ static int read_errs_from_sock(knet_handle_t knet_h, int sockfd)
 	struct sockaddr_storage *origin;
 	char addr_str[KNET_MAX_HOST_LEN];
 	char port_str[KNET_MAX_PORT_LEN];
+	char addr_remote_str[KNET_MAX_HOST_LEN];
+	char port_remote_str[KNET_MAX_PORT_LEN];
 
 	iov.iov_base = &icmph;
 	iov.iov_len = sizeof(icmph);
@@ -325,8 +327,8 @@ static int read_errs_from_sock(knet_handle_t knet_h, int sockfd)
 				sock_err = (struct sock_extended_err*)(void *)CMSG_DATA(cmsg);
 				if (sock_err) {
 					switch (sock_err->ee_origin) {
-						case 0: /* no origin */
-						case 1: /* local source (EMSGSIZE) */
+						case SO_EE_ORIGIN_NONE: /* no origin */
+						case SO_EE_ORIGIN_LOCAL: /* local source (EMSGSIZE) */
 							if (sock_err->ee_errno == EMSGSIZE) {
 								if (pthread_mutex_lock(&knet_h->kmtu_mutex) != 0) {
 									log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Unable to get mutex lock");
@@ -358,16 +360,22 @@ static int read_errs_from_sock(knet_handle_t knet_h, int sockfd)
 							 * those errors are way too noisy
 							 */
 							break;
-						case 2: /* ICMP */
-						case 3: /* ICMP6 */
+						case SO_EE_ORIGIN_ICMP:  /* ICMP */
+						case SO_EE_ORIGIN_ICMP6: /* ICMP6 */
 							origin = (struct sockaddr_storage *)(void *)SO_EE_OFFENDER(sock_err);
 							if (knet_addrtostr(origin, sizeof(origin),
 									   addr_str, KNET_MAX_HOST_LEN,
 									   port_str, KNET_MAX_PORT_LEN) < 0) {
 								log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Received ICMP error from unknown source: %s", strerror(sock_err->ee_errno));
 
 							} else {
-								log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Received ICMP error from %s: %s", addr_str, strerror(sock_err->ee_errno));
+								if (knet_addrtostr(&remote, sizeof(remote),
+									       addr_remote_str, KNET_MAX_HOST_LEN,
+									       port_remote_str, KNET_MAX_PORT_LEN) < 0) {
+									log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Received ICMP error from %s: %s destination unknown", addr_str, strerror(sock_err->ee_errno));
+								} else {
+									log_debug(knet_h, KNET_SUB_TRANSP_UDP, "Received ICMP error from %s: %s %s", addr_str, strerror(sock_err->ee_errno), addr_remote_str);
+								}
 							}
 							break;
 					}