stun transaction engine, first impressions

darcs-hash:20051225132407-1b897-8fa2443754caa2ad64d4373215f45e44bdc8de99.gz

libsofia-sip-ua/nua/nua_common.c

@@ -147,7 +147,7 @@ nua_handle_t *nh_create_handle(nua_t *nua, nua_hmagic_t *hmagic,
       p_to = (void *)-1;
     }
 
-#if HAVE_PTHREAD_H
+#if defined(HAVE_PTHREAD_H) && defined(SU_HAVE_PTHREADS)
 #if __CYGWIN__
     SU_PORT_INITREF(nh);
 #else

libsofia-sip-ua/nua/nua_stack.c

@@ -244,7 +244,7 @@ int ua_init(su_root_t *root, nua_t *nua)
   nua->nua_handles_tail = &nua->nua_handles;
   nh_append(nua, dnh);  
   
-#if SU_HAVE_PTHREADS
+#if defined(HAVE_PTHREAD_H) && defined(SU_HAVE_PTHREADS)
 #if __CYGWIN__
   SU_PORT_INITREF(dnh);
 #else

libsofia-sip-ua/nua/nua_stack.h

@@ -50,7 +50,7 @@
 #include "soa.h"
 
 #if __CYGWIN__
-
+#if defined(SU_HAVE_PTHREADS) && defined(HAVE_PTHREAD_H)
 /* Debugging versions */
 #define SU_PORT_INITREF(p)      (pthread_mutex_init((p)->sup_reflock, NULL), printf("initref(%p)\n", (p)))
 #define SU_PORT_INCREF(p, f)    (pthread_mutex_lock(p->sup_reflock), p->sup_ref++, pthread_mutex_unlock(p->sup_reflock), printf("incref(%p) by %s\n", (p), f))
@@ -76,6 +76,7 @@
 #define SU_PORT_UNLOCK(p, f)  \
   (pthread_mutex_unlock((p)->sup_mutex), printf(" ...%ld at %s unlocked(%p)\n", pthread_self(), f, p))
 
+#endif /* defined(SU_HAVE_PTHREAD) && defined(HAVE_PTHREAD_H) */
 #endif /* __CYGWIN__ */ 
 
 

libsofia-sip-ua/stun/stun.c

@@ -40,8 +40,8 @@
 #include <assert.h>
 
 #define SU_ROOT_MAGIC_T struct stun_handle_s
-#define SU_WAKEUP_ARG_T struct stun_handle_s
-#define SU_TIMER_ARG_T  struct stun_handle_s
+#define SU_WAKEUP_ARG_T struct stun_request_s
+#define SU_TIMER_ARG_T  struct stun_request_s
 
 #include "stun.h"
 #include "stun_internal.h"
@@ -74,6 +74,23 @@ char const stun_nat_unknown[] = "NAT type undetermined",
   stun_nat_res_cone[] = "Restricted Cone NAT",
   stun_nat_port_res_cone[] = "Port Restricted Cone NAT";
 
+#define x_insert(l, n, x) \
+ ((l) ? (l)->x##_prev = &(n)->x##_next : 0, \
+  (n)->x##_next = (l), (n)->x##_prev = &(l), (l) = (n))
+
+#define x_remove(n, x) \
+  ((*(n)->x##_prev = (n)->x##_next) ? \
+   (n)->x##_next->x##_prev = (n)->x##_prev : 0)
+
+#define x_is_inserted(n, x) ((n)->x##_prev != NULL)
+
+typedef struct stun_request_s stun_request_t;
+struct stun_request_s {
+  stun_request_t *sr_next, **sr_prev;
+  stun_msg_t     *sr_msg; 
+  int             sr_root_index;
+};
+
 struct stun_handle_s
 {
   su_home_t       st_home[1];
@@ -81,6 +98,8 @@ struct stun_handle_s
   int             st_root_index;    /**< object index of su_root_register() */
   su_timer_t     *st_connect_timer; /**< timer for TLS connection */
 
+  stun_request_t st_requests[1]; /**< outgoing requests list */
+
   int             st_max_retries;   /**< max resend for sendto() */
   int             st_retry_count;   /**< current retry number */
   long            st_timeout;       /**< timeout for next sendto() */
@@ -91,11 +110,14 @@ struct stun_handle_s
   su_addrinfo_t   st_sec_info;      /**< server secondary info */
   su_sockaddr_t   st_sec_addr[1];   /**< server secondary address */
 
-  su_localinfo_t  st_client_addr[1];  /**< local address returned by server */
+  su_localinfo_t  st_localinfo;     /**< local address returned by server */
+  su_sockaddr_t   st_local_addr[1]; /**< server secondary address */
 
   su_socket_t     st_tls_socket;       /**< outbound socket */
-  
+
+#if 0  
   stun_msg_t     *st_binding_request;     /**< binding request for server */
+#endif
 
   SSL_CTX        *st_ctx;          /**< SSL context for TLS */
   SSL            *st_ssl;          /**< SSL handle for TLS */
@@ -287,11 +309,16 @@ stun_handle_t *stun_handle_tcreate(stun_magic_t *context,
   stun->st_sec_info.ai_addrlen = 16;
   stun->st_sec_info.ai_addr = &stun->st_sec_addr->su_sa;
 
+  /* STUN bind related */
+#if 0
+  clnt_addr = se->st_localinfo;
+  memset(clnt_addr, 0, sizeof(*clnt_addr));
+#endif
+  se->st_localinfo.li_addrlen = sizeof(su_sockaddr_t);
+  se->st_localinfo.li_addr =  &stun->st_local_addr->su_sa;
+
+  se->st_nattype = STUN_NAT_UNKNOWN;
 
-  /* Store server address in *stun, run discovery process?? 
-   * I suppose this may block for the moment
-   */
-  
   stun->st_root     = root;
   stun->st_context  = context;
   stun->st_callback = cb;
@@ -312,9 +339,12 @@ stun_handle_t *stun_handle_tcreate(stun_magic_t *context,
   /* initialize random number generator */
   srand(time(NULL));
   
+  ta_end(ta);
+
   return stun;
 }
 
+
 /** Destroy a STUN client */ 
 void stun_handle_destroy(stun_handle_t *self)
 { 
@@ -328,29 +358,6 @@ void stun_handle_destroy(stun_handle_t *self)
 }
 
 
-int stun_handle_set_bind_socket(stun_handle_t *se, int sockfd)
-{
-  
-  assert(se);
-
-  /* Close the previous associated socket */
-  if (se->st_bind_socket > 0)
-    su_close(se->st_bind_socket);
-
-  se->st_bind_socket = sockfd;
-
-  /* set socket asynchronous */
-  if (su_setblocking(se->st_bind_socket, 0) < 0) {
-    STUN_ERROR(errno, su_setblocking);
-
-    su_close(se->st_bind_socket);
-    return -1;
-  }
-
-  return 0;
-}
-
-
 /** Bind a socket using STUN client. 
  *
  * The function stun_bind() obtains a global address for a UDP socket using
@@ -379,30 +386,50 @@ int stun_handle_set_bind_socket(stun_handle_t *se, int sockfd)
  * 
  */
 int stun_handle_bind(stun_handle_t *se,
-		     /* su_localinfo_t *my_addr, */
-		     int *lifetime)
+		     int *lifetime,
+		     tag_type_t tag, tag_value_t value,
+		     ...)
 {
-  int retval = -1, sockfd;
+  int retval = -1;
+  su_socket_t s = -1;
   su_localinfo_t *clnt_addr = NULL;
   su_sockaddr_t bind_addr;
   socklen_t bind_len;
   char ipaddr[SU_ADDRSIZE + 2];
-
-  /* testing su_getlocalinfo() */
+  stun_request_t *request = NULL;
+  int index;
   su_localinfo_t  hints[1] = {{ LI_CANONNAME | LI_NUMERIC }}, *li, *res = NULL;
-  int i, error, found=0;
+  int i, error, found = 0;
+  unsigned int port,
+  ta_list ta;
   
   assert(se);
 
-  clnt_addr = se->st_client_addr;
-  memset(clnt_addr, 0, sizeof(*clnt_addr));
-  clnt_addr->li_addr = calloc(sizeof(su_sockaddr_t), 1);
-  clnt_addr->li_addrlen = sizeof(su_sockaddr_t);
+  ta_start(ta, tag, value);
 
-  se->st_nattype = STUN_NAT_UNKNOWN;
+  tl_gets(ta_args(ta),
+	  STUNTAG_SOCKET_REF(s),
+	  TAG_END());
+
+  if (s < 0) {
+    SU_DEBUG_3(("%s: invalid socket.\n", __func__));
+    return -1;
+  }
+
+  /* Close the previous associated socket */
+  if (se->st_bind_socket > 0)
+    su_close(se->st_bind_socket);
+
+  /* set socket asynchronous */
+  if (su_setblocking(s, 0) < 0) {
+    STUN_ERROR(errno, su_setblocking);
+
+    su_close(s);
+    return -1;
+  }
+  se->st_bind_socket = s;
 
   hints->li_family = AF_INET;
-  
   if((error = su_getlocalinfo(hints, &res)) == 0) {
     
     /* try to bind to the first available address */
@@ -410,22 +437,19 @@ int stun_handle_bind(stun_handle_t *se,
       if (li->li_family != AF_INET)
 	continue;
       
-      char ipaddr[SU_ADDRSIZE + 2];
-      
       clnt_addr->li_family = li->li_family;
       clnt_addr->li_addrlen = li->li_addrlen;
       
       memcpy(clnt_addr->li_addr, li->li_addr, sizeof(su_addrinfo_t));
-      
-      inet_ntop(clnt_addr->li_family, SU_ADDR(clnt_addr->li_addr), ipaddr, sizeof(ipaddr));
-      SU_DEBUG_3(("%s: local address found to be %s:%u\n", __func__, 
-		  ipaddr,
-		  (unsigned) ntohs(clnt_addr->li_addr->su_port)));
+      inet_ntop(clnt_addr->li_family, SU_ADDR(clnt_addr->li_addr),
+		ipaddr, sizeof(ipaddr));
+      port = ntohs(clnt_addr->li_addr->su_port)
+      SU_DEBUG_3(("%s: local address found to be %s:%u\n",
+		  __func__, ipaddr, port));
       found = 1;
       break;
     }
     
-    
     if (!found) {
       STUN_ERROR(error, su_getlocalinfo);
       return -1;
@@ -438,11 +462,27 @@ int stun_handle_bind(stun_handle_t *se,
   if (res)
     su_freelocalinfo(res);
 
-  /* run protocol here... */
-  sockfd = se->st_bind_socket;
+  s = se->st_bind_socket;
+
+  events = SU_WAIT_IN | SU_WAIT_ERR;
+
+  if (su_wait_create(wait, s, events) == -1) {
+    STUN_ERROR(su_errno(), su_wait_create);
+    return -1;
+  }
+
+  /* Register receiving function with events specified above */
+  if ((index = su_root_register(se->st_root,
+				wait, stun_bind_callback,
+				se, 0)) < 0) {
+    STUN_ERROR(errno, su_root_register);
+    return -1;
+  }
+  
+  request->sr_root_index = index;
 
   inet_ntop(clnt_addr->li_family, SU_ADDR(clnt_addr->li_addr), ipaddr, sizeof(ipaddr));
-  if (bind(sockfd, (struct sockaddr *) &clnt_addr->li_addr, clnt_addr->li_addrlen) < 0) {
+  if (bind(s, (struct sockaddr *) &clnt_addr->li_addr, clnt_addr->li_addrlen) < 0) {
     SU_DEBUG_3(("%s: Error binding to %s:%u\n", __func__, ipaddr,
 		(unsigned) ntohs(clnt_addr->li_addr->su_port)));
     return -1;
@@ -452,7 +492,7 @@ int stun_handle_bind(stun_handle_t *se,
 	      (unsigned) ntohs(clnt_addr->li_addr->su_port)));
 
   bind_len = clnt_addr->li_addrlen;
-  if (getsockname(sockfd, (struct sockaddr *) &bind_addr, &bind_len) != 0) {
+  if (getsockname(s, (struct sockaddr *) &bind_addr, &bind_len) != 0) {
     STUN_ERROR(errno, getsockname);
     return -1;
   }
@@ -461,8 +501,20 @@ int stun_handle_bind(stun_handle_t *se,
   SU_DEBUG_3(("%s: Local socket bound to: %s:%u\n", __func__, ipaddr, 
 	      (unsigned) ntohs(bind_addr.su_port)));
 
-  retval = stun_send_binding_request(se, se->st_pri_addr, 0, 0);
 
+  /* Create default message (last two params zeros) */
+  request->sr_msg = calloc(sizeof(*binding_request), 1);
+  if (stun_make_binding_req(se, request->sr_msg, 0, 0) < 0) 
+    return -1;
+
+  /* Insert this request to the request queue */
+  x_insert(se->st_requests, request, sr);
+
+  retval = stun_send_binding_request(se, se->st_pri_addr);
+
+  if (retval < 0) {
+    stun_free_message(msg);
+  }
   if (lifetime) {
     if (retval == 0)
       *lifetime = 3600;
@@ -471,6 +523,9 @@ int stun_handle_bind(stun_handle_t *se,
   }
 
   /* note: we always report success if bind() succeeds */
+
+  ta_end(ta);
+
   return 0;
 
 }
@@ -482,11 +537,12 @@ int stun_handle_bind(stun_handle_t *se,
  */
 su_localinfo_t *stun_handle_get_local_addr(stun_handle_t *se)
 {
-  return se->st_client_addr;
+  return se->st_localinfo;
 }
 
 
 
+#if 0
 /** Return type of NAT
  *  This function may take a long time to finish.
  *  XXX - mela: not for long!!!
@@ -591,7 +647,6 @@ int stun_handle_get_nattype(stun_handle_t *se,
   return retval;
 }
 
-#if 0
 int stun_handle_get_nattype(stun_handle_t *se,
 			    su_localinfo_t *my_addr,
 			    int *addrlen)
@@ -1083,7 +1138,7 @@ int stun_bind_callback(su_root_magic_t *m, su_wait_t *w, stun_handle_t *self)
   struct sockaddr_in recv_addr;
   socklen_t recv_addr_len;
   int events = su_wait_events(w, self->st_tls_socket);
-  su_localinfo_t *clnt_addr = self->st_client_addr;
+  su_localinfo_t *clnt_addr = self->st_localinfo;
 
   SU_DEBUG_7(("%s(%p): events%s%s%s\n", __func__, self,
 	      events & SU_WAIT_IN ? " IN" : "",
@@ -1098,6 +1153,9 @@ int stun_bind_callback(su_root_magic_t *m, su_wait_t *w, stun_handle_t *self)
     return 0;
   }
 
+  /* Parse here the incoming message. Based on the decoded payload,
+   * find the corresponding request (based on TID) */
+
   binding_request = self->st_binding_request;
   s = self->st_bind_socket;
 
@@ -1155,6 +1213,20 @@ int stun_bind_callback(su_root_magic_t *m, su_wait_t *w, stun_handle_t *self)
     return retval;
   }
 
+  stun_request_t *req;
+  for (req = self->st_requests; req; req->sr_next) {
+    if (memcmp(req->sr_msg.stun_hdr.tran_id,
+	       binding_response.stun_hdr.tran_id,
+	       sizeof(req->sr_msg.stun_hdr.tran_id)) == 0)
+      break;
+  }
+
+  if (!req) {
+    SU_DEBUG_3(("%s: Unknown response. No matching request found.\n", __func__));
+    /* callback here */
+    return;
+  }
+    
   switch (binding_response.stun_hdr.msg_type) {
   case BINDING_RESPONSE:
     if (stun_validate_message_integrity(&binding_response, &self->st_passwd) < 0) {
@@ -1287,11 +1359,10 @@ static void stun_sendto_timer_cb(su_root_magic_t *magic,
  * @ERROR ETIMEDOUT       Request timed out.
  * 
  */   
-int stun_send_binding_request(stun_handle_t *se,
-			      su_sockaddr_t  *srvr_addr,
-			      /* su_localinfo_t *clnt_addr, */
-			      int chg_ip,
-			      int chg_port)
+int stun_send_binding_request(stun_request_t *request,
+			      su_sockaddr_t *srvr_addr,
+			      stun_msg_t    *msg,
+)
 {
   int s;
   int events = 0;  
@@ -1299,8 +1370,11 @@ int stun_send_binding_request(stun_handle_t *se,
   su_wait_t wait[1] = { SU_WAIT_INIT };
   su_timer_t *sendto_timer = NULL;
   char ipaddr[SU_ADDRSIZE + 2];
+  stun_handle_t *se = request->sr_handle;
 
-  stun_msg_t *binding_request = calloc(sizeof(*binding_request), 1);
+#if 0
+  stun_msg_t *binding_request =  NULL;
+#endif
 
   assert (se && srvr_addr);
 
@@ -1314,37 +1388,22 @@ int stun_send_binding_request(stun_handle_t *se,
 	      ipaddr, ntohs(srvr_addr->su_port),
 	      se->st_use_msgint, chg_ip, chg_port));
 
+#if 0
+  binding_request = calloc(sizeof(*binding_request), 1);
   /* compose binding request */
-  if(stun_make_binding_req(se, binding_request, chg_ip, chg_port) < 0) 
+  if (stun_make_binding_req(se, binding_request, chg_ip, chg_port) < 0) 
     return -1;
+#endif
 
-  events = SU_WAIT_IN | SU_WAIT_ERR;
-
-  if (stun_send_message(s, srvr_addr, binding_request, &(se->st_passwd)) < 0) {
-    stun_free_message(binding_request);
-    return -1;
-  }
-
-  se->st_binding_request = binding_request;
-
-  if (su_wait_create(wait, s, events) == -1) {
-    STUN_ERROR(su_errno(), su_wait_create);
-    return -1;
-  }
-
-  /* Register receiving function with events specified above */
-  if ((se->ss_root_index = su_root_register(se->st_root,
-					    wait, stun_bind_callback,
-					    se, 0)) < 0) {
-    STUN_ERROR(errno, su_root_register);
+  if (stun_send_message(s, srvr_addr, msg, &(se->st_passwd)) < 0) {
     return -1;
   }
 
   /* Create and start timer */
   sendto_timer = su_timer_create(su_root_task(se->st_root), STUN_SENDTO_TIMEOUT);
-  su_timer_set(sendto_timer, stun_sendto_timer_cb, se);
+  su_timer_set(sendto_timer, stun_sendto_timer_cb, request);
 
-  se->st_state = stun_bind_sending;
+  request->st_state = stun_bind_sending;
   /* se->st_callback(se->st_context, se, se->st_state); */
 
   return 0;
@@ -1691,7 +1750,7 @@ int stun_handle_get_lifetime(stun_handle_t *se,
     stun_free_message(&binding_response);
     sleep(lt);
     /* send from sockfdy */
-    if(stun_make_binding_req(se, &binding_request, 0, 0) <0)
+    if (stun_make_binding_req(se, &binding_request, 0, 0) <0)
       return retval;
     stun_add_response_address(&binding_request, &mapped_addr);
     if (stun_send_message(sockfdy, se->st_pri_addr, &binding_request, &(se->st_passwd)) < 0)

libsofia-sip-ua/stun/stun_tag.c

@@ -73,3 +73,20 @@ tag_typedef_t stuntag_server = STRTAG_TYPEDEF(server);
  * Corresponding tag taking reference parameter is STUNTAG_INTEGRITY_REF()
  */
 tag_typedef_t stuntag_integrity = BOOLTAG_TYPEDEF(srtp_integrity);
+
+/**@def STUNTAG_SOCKET(x)
+ *  
+ * Bind socket for STUN.
+ *
+ * @par Used with
+ *    stun_handle_bind() \n
+ *
+ * @par Parameter type
+ *    int (su_socket_t)
+ *
+ * @par Values
+ *    IPv4 (AF_INET) socket
+ *
+ * Corresponding tag taking reference parameter is STUNTAG_SOCKET_REF()
+ */
+tag_typedef_t stuntag_socket = INTTAG_TYPEDEF(socket);

libsofia-sip-ua/stun/stun_tag.h

@@ -45,4 +45,9 @@ extern tag_typedef_t stuntag_integrity;
 #define STUNTAG_INTEGRITY_REF(x) stuntag_integrity_ref, tag_int_vr(&(x))
 extern tag_typedef_t stuntag_integrity_ref;
 
+#define STUNTAG_SOCKET(x) stuntag_socket, tag_int_v(x)
+extern tag_typedef_t stuntag_socket;
+#define STUNTAG_SOCKET_REF(x) stuntag_socket_ref, tag_int_vr(&(x))
+extern tag_typedef_t stuntag_socket_ref;
+
 #endif /* STUN_TAG_H */

libsofia-sip-ua/su/su_port.c

@@ -315,6 +315,7 @@ struct su_port_s {
 #define SU_PORT_INITLOCK(p)    (void)(p)
 #define SU_PORT_LOCK(p, f)      (void)(p)
 #define SU_PORT_UNLOCK(p, f)    (void)(p)
+#define SU_PORT_ZAPREF(p, f)    ((p)->sup_ref--)
 
 #define SU_PORT_INITREF(p)      ((p)->sup_ref = 1)
 #define SU_PORT_INCREF(p, f)    ((p)->sup_ref++)

libsofia-sip-ua/su/su_root.c

@@ -411,7 +411,11 @@ su_root_t *su_root_create_with_port(su_root_magic_t *magic,
 
   if (self) {
     self->sur_magic = magic;
+#if SU_HAVE_PTHREADS
     self->sur_threading = SU_HAVE_PTHREADS;
+#else
+    self->sur_threading = 0;
+#endif
     su_task_new(self->sur_task, self, port);
   } else {
     su_port_decref(port, "su_root_create");