Changeset 526 for trunk/src/sh_ipvx.c

Timestamp:

Jun 29, 2017, 9:20:32 PM (7 years ago)

Author:

katerina

Message:

Fix for ticket #421 (spurious port detections) and ticket #422 (PortCheckSkip bug).

File:

• trunk/src/sh_ipvx.c (modified) (1 diff)

trunk/src/sh_ipvx.c

@@ -251 +251 @@
 }
 
-int sh_ipvx_get_port(struct sockaddr * sa, int sa_family)
+int sh_ipvx_get_port(struct sh_sockaddr * sa)
 {
   int port = 0;
 #if defined(USE_IPVX)
 
-  switch (sa_family)
+  switch (sa->ss_family)
     {
     case AF_INET:
-      port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+      port = ntohs((sa->sin).sin_port);
       break;
     case AF_INET6:
-      port = ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
-      break;
-    }
-#else
-  (void) sa_family;
-  port = ntohs(((struct sockaddr_in *)sa)->sin_port);
+      port = ntohs((sa->sin6).sin6_port);
+      break;
+    }
+#else
+  port = ntohs((sa->sin).sin_port);
 #endif
   return port;