moved remote end handling and active sock to udp.c

3 files changed, 47 insertions, 28 deletions

diff --git a/src/uanytun.c b/src/uanytun.c
index 3473b24..674e7bb 100644
--- a/src/uanytun.c
+++ b/src/uanytun.c
@@ -124,7 +124,7 @@ int process_tun_data(tun_device_t* dev, udp_t* sock, options_t* opt, plain_packe
   else
     plain_packet_set_type(plain_packet, PAYLOAD_TYPE_UNKNOWN);
 
-  if(!sock->active_sock_ || !sock->active_sock_->remote_end_set_)
+  if(!udp_has_remote(sock))
     return 0;
 
   cipher_encrypt(c, kd, kd_outbound, plain_packet, encrypted_packet, seq_nr, opt->sender_id_, opt->mux_);
@@ -182,17 +182,7 @@ int process_sock_data(tun_device_t* dev, int fd, udp_t* sock, options_t* opt, pl
     return -2;
   }
 
-  udp_set_active_sock(sock, fd);
-  if(sock->active_sock_) {
-    if(remote.len_ != sock->active_sock_->remote_end_.len_ ||
-       memcmp(&(remote.addr_), &(sock->active_sock_->remote_end_.addr_), remote.len_)) {
-      memcpy(&(sock->active_sock_->remote_end_.addr_), &(remote.addr_), remote.len_);
-      sock->active_sock_->remote_end_set_ = 1;
-      char* addrstring = udp_endpoint_to_string(remote);
-      log_printf(NOTICE, "autodetected remote host changed %s", addrstring);
-      free(addrstring);
-    }
-  }
+  udp_update_remote(sock, fd, &remote);
 
   if(encrypted_packet_get_payload_length(encrypted_packet) <= plain_packet_get_header_length()) {
     log_printf(WARNING, "ignoring packet with zero length payload");
diff --git a/src/udp.c b/src/udp.c
index 883e9fc..e774ef4 100644
--- a/src/udp.c
+++ b/src/udp.c
@@ -135,7 +135,7 @@ int udp_init(udp_t* sock, const char* local_addr, const char* port, resolv_addr_
       return -1;
     }
 
-    char* local_string = udp_endpoint_to_string(new_sock->local_end_);
+    char* local_string = udp_endpoint_to_string(&(new_sock->local_end_));
     if(local_string) {
       log_printf(NOTICE, "listening on: %s", local_string);
       free(local_string);
@@ -163,6 +163,14 @@ int udp_init_fd_set(udp_t* sock, fd_set* set)
   return max_fd;
 }
 
+int udp_has_remote(udp_t* sock)
+{
+  if(!sock->active_sock_ || !sock->active_sock_->remote_end_set_)
+    return 0;
+
+  return 1;
+}
+
 int udp_resolv_remote(udp_t* sock, const char* remote_addr, const char* port, resolv_addr_type_t resolv_type)
 {
   if(!sock || !remote_addr || !port)
@@ -211,18 +219,35 @@ int udp_resolv_remote(udp_t* sock, const char* remote_addr, const char* port, re
   return 0;
 }
 
-void udp_set_active_sock(udp_t* sock, int fd)
+void udp_update_remote(udp_t* sock, int fd, udp_endpoint_t* remote)
 {
-  if(!sock || (sock->active_sock_ && sock->active_sock_->fd_ == fd))
+  if(!sock)
     return;
 
-  udp_socket_t* s = sock->socks_;
-  while(s) {
-    if(s->fd_ == fd) {
-      sock->active_sock_ = s;
-      return;
+  if(!(sock->active_sock_) || sock->active_sock_->fd_ == fd) {
+    udp_socket_t* s = sock->socks_;
+    while(s) {
+      if(s->fd_ == fd) {
+        sock->active_sock_ = s;
+        break;
+      }
+      s = s->next_;
+    }
+  }
+
+  if(!remote)
+    return;
+
+  if(sock->active_sock_) {
+    if(remote->len_ != sock->active_sock_->remote_end_.len_ ||
+       memcmp(&(remote->addr_), &(sock->active_sock_->remote_end_.addr_), remote->len_)) {
+      memcpy(&(sock->active_sock_->remote_end_.addr_), &(remote->addr_), remote->len_);
+      sock->active_sock_->remote_end_.len_ = remote->len_;
+      sock->active_sock_->remote_end_set_ = 1;
+      char* addrstring = udp_endpoint_to_string(remote);
+      log_printf(NOTICE, "autodetected remote host changed %s", addrstring);
+      free(addrstring);
     }
-    s = s->next_;
   }
 }
 
@@ -243,20 +268,23 @@ void udp_close(udp_t* sock)
   sock->socks_ = NULL;
 }
 
-char* udp_endpoint_to_string(udp_endpoint_t e)
+char* udp_endpoint_to_string(udp_endpoint_t* e)
 {
+  if(!e)
+    return strdup("<null>");
+
   char addrstr[INET6_ADDRSTRLEN + 1], portstr[6], *ret;
   char addrport_sep = ':';
 
-  switch(e.addr_.ss_family)
+  switch(e->addr_.ss_family)
   {
   case AF_INET: addrport_sep = ':'; break;
   case AF_INET6: addrport_sep = '.'; break;
   case AF_UNSPEC: return NULL;
-  default: return strdup("unknown address type");
+  default: return strdup("<unknown address type>");
   }
 
-  int errcode  = getnameinfo((struct sockaddr *)&(e.addr_), e.len_, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV);
+  int errcode  = getnameinfo((struct sockaddr *)&(e->addr_), e->len_, addrstr, sizeof(addrstr), portstr, sizeof(portstr), NI_NUMERICHOST | NI_NUMERICSERV);
   if (errcode != 0) return NULL;
   int len = asprintf(&ret, "%s%c%s", addrstr, addrport_sep ,portstr);
   if(len == -1) return NULL;
@@ -268,7 +296,7 @@ char* udp_get_remote_end_string(udp_t* sock)
   if(!sock || !sock->active_sock_->remote_end_set_)
     return NULL;
 
-  return udp_endpoint_to_string(sock->active_sock_->remote_end_);
+  return udp_endpoint_to_string(&(sock->active_sock_->remote_end_));
 }
 
 int udp_read(udp_t* sock, int fd, u_int8_t* buf, u_int32_t len, udp_endpoint_t* remote_end)
diff --git a/src/udp.h b/src/udp.h
index 2684c13..ffc87d6 100644
--- a/src/udp.h
+++ b/src/udp.h
@@ -63,11 +63,12 @@ typedef struct udp_struct udp_t;
 
 int udp_init(udp_t* sock, const char* local_addr, const char* port, resolv_addr_type_t resolv_type);
 int udp_init_fd_set(udp_t* sock, fd_set* set);
+int udp_has_remote(udp_t* sock);
 int udp_resolv_remote(udp_t* sock, const char* remote_addr, const char* port, resolv_addr_type_t resolv_type);
-void udp_set_active_sock(udp_t* sock, int fd);
+void udp_update_remote(udp_t* sock, int fd, udp_endpoint_t* remote);
 void udp_close(udp_t* sock);
 
-char* udp_endpoint_to_string(udp_endpoint_t e);
+char* udp_endpoint_to_string(udp_endpoint_t* e);
 char* udp_get_remote_end_string(udp_t* sock);
 
 int udp_read(udp_t* sock, int fd, u_int8_t* buf, u_int32_t len, udp_endpoint_t* remote_end);