3 files changed, 31 insertions, 26 deletions

diff --git a/radsecproxy.c b/radsecproxy.c
index dc495cd..669f03c 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -173,16 +173,8 @@ int resolvepeer(struct clsrvconf *conf, int ai_flags) {
 	    debug(DBG_WARN, "resolvepeer: can't resolve (null) port (null)");
 	    return 0;
 	}
-	for (res = addrinfo; res; res = res->ai_next) {
-	    switch (res->ai_family) {
-	    case AF_INET:
-		((struct sockaddr_in *)res->ai_addr)->sin_port = 0;
-		break;
-	    case AF_INET6:
-		((struct sockaddr_in6 *)res->ai_addr)->sin6_port = 0;
-		break;
-	    }
-	}
+	for (res = addrinfo; res; res = res->ai_next)
+	    port_set(res->ai_addr, 0);
     } else {
 	if (slash)
 	    hints.ai_flags |= AI_NUMERICHOST;
@@ -894,32 +886,20 @@ int clientradputudp(struct server *server, unsigned char *rad) {
     struct sockaddr_storage sa;
     struct sockaddr *sap;
     struct clsrvconf *conf = server->conf;
-    in_port_t *port = NULL;
+    uint16_t port;
     
     len = RADLEN(rad);
+    port = port_get(conf->addrinfo->ai_addr);
     
     if (*rad == RAD_Accounting_Request) {
 	sap = (struct sockaddr *)&sa;
 	memcpy(sap, conf->addrinfo->ai_addr, conf->addrinfo->ai_addrlen);
+	port_set(sap, ++port);
     } else
 	sap = conf->addrinfo->ai_addr;
     
-    switch (sap->sa_family) {
-    case AF_INET:
-	port = &((struct sockaddr_in *)sap)->sin_port;
-	break;
-    case AF_INET6:
-	port = &((struct sockaddr_in6 *)sap)->sin6_port;
-	break;
-    default:
-	return 0;
-    }
-
-    if (*rad == RAD_Accounting_Request)
-	*port = htons(ntohs(*port) + 1);
-    
     if (sendto(server->sock, rad, len, 0, sap, conf->addrinfo->ai_addrlen) >= 0) {
-	debug(DBG_DBG, "clienradputudp: sent UDP of length %d to %s port %d", len, conf->host, ntohs(*port));
+	debug(DBG_DBG, "clienradputudp: sent UDP of length %d to %s port %d", len, conf->host, port);
 	return 1;
     }
 
diff --git a/util.c b/util.c
index d551cf0..096b7a6 100644
--- a/util.c
+++ b/util.c
@@ -72,6 +72,27 @@ void printfchars(char *prefixfmt, char *prefix, char *charfmt, char *chars, int
     printf("\n");
 }
 
+uint16_t port_get(struct sockaddr *sa) {
+    switch (sa->sa_family) {
+    case AF_INET:
+	return ntohs(((struct sockaddr_in *)sa)->sin_port);
+    case AF_INET6:
+	return ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+    }
+    return 0;
+}
+
+void port_set(struct sockaddr *sa, uint16_t port) {
+    switch (sa->sa_family) {
+    case AF_INET:
+	((struct sockaddr_in *)sa)->sin_port = htons(port);
+	break;
+    case AF_INET6:
+	((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
+	break;
+    }
+}
+
 char *addr2string(struct sockaddr *addr, socklen_t len) {
     struct sockaddr_in6 *sa6;
     struct sockaddr_in sa4;
diff --git a/util.h b/util.h
index 7d79856..936c2de 100644
--- a/util.h
+++ b/util.h
@@ -1,6 +1,10 @@
 #include <sys/socket.h>
+#include <netdb.h>
 
 char *stringcopy(const char *s, int len);
 char *addr2string(struct sockaddr *addr, socklen_t len);
+uint16_t port_get(struct sockaddr *sa);
+void port_set(struct sockaddr *sa, uint16_t port);
+
 void printfchars(char *prefixfmt, char *prefix, char *charfmt, char *chars, int len);
 int connectport(int type, char *host, char *port);