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

Timestamp:

Jul 20, 2007 8:08:30 AM (17 years ago)

Author:

bennylp

Message:

Ticket #354: build PJLIB as dynamic libraries (.DSO) in Symbian

File:

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

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

@@ -160 +160 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(srv && (type==PJ_SOCK_DGRAM||type==PJ_SOCK_STREAM),
+    PJ_ASSERT_RETURN(srv && (type==pj_SOCK_DGRAM()||type==pj_SOCK_STREAM()),
                      PJ_EINVAL);
     si = pj_stun_server_get_info(srv);
@@ -186 +186 @@
     usage_cb.on_destroy = &tu_on_destroy;
     status = pj_stun_usage_create(srv, "turn%p", &usage_cb,
-                                  PJ_AF_INET, tu->type, 0,
+                                  pj_AF_INET(), tu->type, 0,
                                   &local_addr, sizeof(local_addr),
                                   &tu->usage);
@@ -298 +298 @@
     /* STUN message decoding flag */
     flags = 0;
-    if (tu->type == PJ_SOCK_DGRAM)
+    if (tu->type == pj_SOCK_DGRAM())
         flags |= PJ_STUN_IS_DATAGRAM;
     
@@ -362 +362 @@
 
         /* Allocate specific port */
-        status = pj_sock_socket(PJ_AF_INET, type, 0, &sock);
+        status = pj_sock_socket(pj_AF_INET(), type, 0, &sock);
         if (status != PJ_SUCCESS)
             return status;
@@ -401 +401 @@
             }
 
-            status = pj_sock_socket(PJ_AF_INET, type, 0, &sock);
+            status = pj_sock_socket(pj_AF_INET(), type, 0, &sock);
             if (status != PJ_SUCCESS)
                 return status;
@@ -511 +511 @@
     sd = (struct session_data*) pj_stun_session_get_user_data(sess);
 
-    if (sd->tu->type == PJ_SOCK_DGRAM) {
+    if (sd->tu->type == pj_SOCK_DGRAM()) {
         return pj_stun_usage_sendto(sd->tu->usage, pkt, pkt_size, 0,
                                     dst_addr, addr_len);
@@ -547 +547 @@
 static const char *get_tp_type(int type)
 {
-    if (type==PJ_SOCK_DGRAM)
+    if (type==pj_SOCK_DGRAM())
         return "udp";
-    else if (type==PJ_SOCK_STREAM)
+    else if (type==pj_SOCK_STREAM())
         return "tcp";
     else
@@ -595 +595 @@
     sd = (struct session_data*) pj_stun_session_get_user_data(sess);
 
-    if (sd->tu->type == PJ_SOCK_DGRAM) {
+    if (sd->tu->type == pj_SOCK_DGRAM()) {
         return pj_stun_usage_sendto(sd->tu->usage, pkt, pkt_size, 0,
                                     dst_addr, addr_len);
@@ -952 +952 @@
         return PJ_SUCCESS;
     } else if (a_rt) {
-        client->sock_type = a_rt->value ? PJ_SOCK_STREAM : PJ_SOCK_DGRAM;
+        client->sock_type = a_rt->value ? pj_SOCK_STREAM() : pj_SOCK_DGRAM();
     } else {
         client->sock_type = client->tu->type;;
@@ -958 +958 @@
 
     /* Process REQUESTED-IP attribute */
-    if (a_rip && a_rip->sockaddr.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);
@@ -1131 +1131 @@
         client->active_peer = NULL;
 
-    } else if (a_raddr->sockaddr.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,
@@ -1197 +1197 @@
         return PJ_SUCCESS;
 
-    } else if (a_raddr->sockaddr.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;
@@ -1210 +1210 @@
         datalen = a_data->length;
 
-    } else if (client->sock_type == PJ_SOCK_STREAM) {
+    } else if (client->sock_type == pj_SOCK_STREAM()) {
         /* Discard if no Data and Allocation type is TCP */
         return PJ_SUCCESS;