Changeset 1091 for pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

Timestamp:

Mar 21, 2007 9:31:01 AM (14 years ago)

Author:

bennylp

Message:

s/stun_setting/stun_config

File:

• pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c (modified) (8 diffs)

pjproject/trunk/pjnath/src/pjstun-srv-test/turn_usage.c

@@ -166 +166 @@
     tu->type = type;
     tu->pf = si->pf;
-    tu->cfg = si->cfg;
+    tu->cfg = &si->stun_cfg;
     tu->ioqueue = si->ioqueue;
     tu->timer_heap = si->timer_heap;
@@ -198 +198 @@
     sess_cb.on_send_msg = &tu_sess_on_send_msg;
     sess_cb.on_rx_request = &tu_sess_on_rx_request;
-    status = pj_stun_session_create(si->cfg, "turns%p", &sess_cb, PJ_FALSE,
-                                    &tu->default_session);
+    status = pj_stun_session_create(&si->stun_cfg, "turns%p", &sess_cb, 
+                                    PJ_FALSE, &tu->default_session);
     if (status != PJ_SUCCESS) {
         pj_stun_usage_destroy(tu->usage);
@@ -934 +934 @@
 
     /* Process REQUESTED-IP attribute */
-    if (a_rip && a_rip->addr.addr.sa_family != PJ_AF_INET) {
+    if (a_rip && a_rip->sockaddr.addr.sa_family != PJ_AF_INET) {
         client_respond(client, msg, PJ_STUN_SC_INVALID_IP_ADDR, NULL,
                        src_addr, src_addr_len);
@@ -940 +940 @@
         
     } else if (a_rip) {
-        req_addr.sin_addr.s_addr = a_rip->addr.ipv4.sin_addr.s_addr;
+        req_addr.sin_addr.s_addr = a_rip->sockaddr.ipv4.sin_addr.s_addr;
     }
 
@@ -1107 +1107 @@
         client->active_peer = NULL;
 
-    } else if (a_raddr->addr.addr.sa_family != PJ_AF_INET) {
+    } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) {
         /* Bad request (not IPv4) */
         client_respond(client, msg, PJ_STUN_SC_BAD_REQUEST, NULL,
@@ -1126 +1126 @@
 
         /* Add a new peer/permission if we don't have one for this address */
-        peer = client_get_peer(client, &a_raddr->addr.ipv4, &hval);
+        peer = client_get_peer(client, &a_raddr->sockaddr.ipv4, &hval);
         if (peer==NULL) {
-            peer = client_add_peer(client, &a_raddr->addr.ipv4, hval);
+            peer = client_add_peer(client, &a_raddr->sockaddr.ipv4, hval);
         }
 
@@ -1173 +1173 @@
         return PJ_SUCCESS;
 
-    } else if (a_raddr->addr.addr.sa_family != PJ_AF_INET) {
+    } else if (a_raddr->sockaddr.addr.sa_family != PJ_AF_INET) {
         /* REMOTE-ADDRESS present but not IPv4, discard packet */
         return PJ_SUCCESS;
@@ -1196 +1196 @@
 
     /* Add to peer table if necessary */
-    if (client_get_peer(client, &a_raddr->addr.ipv4, &hval)==NULL)
-        client_add_peer(client, &a_raddr->addr.ipv4, hval);
+    if (client_get_peer(client, &a_raddr->sockaddr.ipv4, &hval)==NULL)
+        client_add_peer(client, &a_raddr->sockaddr.ipv4, hval);
 
     /* Send the packet */
     pj_ioqueue_sendto(client->key, &client->pkt_write_key, 
                       data, &datalen, 0,
-                      &a_raddr->addr.ipv4, sizeof(a_raddr->addr.ipv4));
+                      &a_raddr->sockaddr.ipv4, sizeof(pj_sockaddr_in));
 
     return PJ_SUCCESS;