Changeset 1091 for pjproject/trunk/pjnath/src/pjstun-client/client_main.c

Timestamp:

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

Author:

bennylp

Message:

s/stun_setting/stun_config

File:

• pjproject/trunk/pjnath/src/pjstun-client/client_main.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjstun-client/client_main.c

@@ -33 +33 @@
 static struct global
 {
-    pj_stun_endpoint    *endpt;
+    pj_stun_config       stun_config;
     pj_pool_t           *pool;
     pj_caching_pool      cp;
@@ -105 +105 @@
                                            PJ_STUN_ATTR_RELAY_ADDR, 0);
                 if (ar) {
-                    pj_memcpy(&g.relay_addr, &ar->addr.ipv4,
+                    pj_memcpy(&g.relay_addr, &ar->sockaddr.ipv4,
                               sizeof(pj_sockaddr_in));
                     PJ_LOG(3,(THIS_FILE, "Relay address is %s:%d",
@@ -209 +209 @@
     pj_assert(status == PJ_SUCCESS);
 
-    status = pj_stun_endpoint_create(&g.cp.factory, 0, NULL, g.th, &g.endpt);
+    pj_stun_config_init(&g.stun_config, &g.cp.factory, 0, NULL, g.th);
     pj_assert(status == PJ_SUCCESS);
 
@@ -236 +236 @@
     stun_cb.on_request_complete = &on_request_complete;
 
-    status = pj_stun_session_create(g.endpt, NULL, &stun_cb, 
+    status = pj_stun_session_create(&g.stun_config, NULL, &stun_cb, 
                                     o.use_fingerprint!=0, &g.sess);
     pj_assert(status == PJ_SUCCESS);
@@ -282 +282 @@
     if (g.sess)
         pj_stun_session_destroy(g.sess);
-    if (g.endpt)
-        pj_stun_endpoint_destroy(g.endpt);
     if (g.sock != PJ_INVALID_SOCKET)
         pj_sock_close(g.sock);