Changeset 2177 for pjproject

Timestamp:

Jul 25, 2008 10:45:34 AM (16 years ago)

Author:

bennylp

Message:

Fixed linking errors in pjnath when TCP is disabled in PJLIB

Location:

pjproject/trunk

Files:

• pjlib/include/pj/activesock.h (modified) (2 diffs)
• pjlib/src/pj/activesock.c (modified) (6 diffs)
• pjnath/src/pjnath/turn_sock.c (modified) (3 diffs)
• pjnath/src/pjturn-srv/listener_tcp.c (modified) (2 diffs)
• pjnath/src/pjturn-srv/main.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/activesock.h

@@ -414 +414 @@
                                           int addr_len);
 
+#if PJ_HAS_TCP
 /**
  * Starts asynchronous socket accept() operations on this active socket. 
@@ -458 +459 @@
                                                  int addr_len);
 
+#endif  /* PJ_HAS_TCP */
 
 /**

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -76 +76 @@
                                       pj_ioqueue_op_key_t *op_key,
                                       pj_ssize_t bytes_sent);
+#if PJ_HAS_TCP
 static void ioqueue_on_accept_complete(pj_ioqueue_key_t *key, 
                                        pj_ioqueue_op_key_t *op_key,
@@ -82 +83 @@
 static void ioqueue_on_connect_complete(pj_ioqueue_key_t *key, 
                                         pj_status_t status);
-
+#endif
 
 PJ_DEF(void) pj_activesock_cfg_default(pj_activesock_cfg *cfg)
@@ -122 +123 @@
     ioq_cb.on_read_complete = &ioqueue_on_read_complete;
     ioq_cb.on_write_complete = &ioqueue_on_write_complete;
+#if PJ_HAS_TCP
     ioq_cb.on_connect_complete = &ioqueue_on_connect_complete;
     ioq_cb.on_accept_complete = &ioqueue_on_accept_complete;
+#endif
 
     status = pj_ioqueue_register_sock(pool, ioqueue, sock, asock, 
@@ -488 +491 @@
 }
 
-
+#if PJ_HAS_TCP
 PJ_DEF(pj_status_t) pj_activesock_start_accept(pj_activesock_t *asock,
                                                pj_pool_t *pool)
@@ -578 +581 @@
 }
 
-
 static void ioqueue_on_connect_complete(pj_ioqueue_key_t *key, 
                                         pj_status_t status)
@@ -595 +597 @@
     }
 }
-
+#endif  /* PJ_HAS_TCP */
+

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -112 +112 @@
     PJ_ASSERT_RETURN(af==pj_AF_INET() || af==pj_AF_INET6(), PJ_EINVAL);
     PJ_ASSERT_RETURN(options==0, PJ_EINVAL);
+    PJ_ASSERT_RETURN(conn_type!=PJ_TURN_TP_TCP || PJ_HAS_TCP, PJ_EINVAL);
 
     switch (conn_type) {
@@ -641 +642 @@
 
         /* Initiate non-blocking connect */
+#if PJ_HAS_TCP
         status=pj_activesock_start_connect(turn_sock->active_sock, 
                                            turn_sock->pool,
@@ -651 +653 @@
             return;
         }
+#else
+        on_connect_complete(turn_sock->active_sock, PJ_SUCCESS);
+#endif
 
         /* Done for now. Subsequent work will be done in 

pjproject/trunk/pjnath/src/pjturn-srv/listener_tcp.c

@@ -20 +20 @@
 #include <pj/compat/socket.h>
 
+#if PJ_HAS_TCP
+
 struct accept_op
 {
@@ -479 +481 @@
 }
 
+#else   /* PJ_HAS_TCP */
+
+/* To avoid empty translation unit warning */
+int listener_tcp_dummy = 0;
+
+#endif  /* PJ_HAS_TCP */
+

pjproject/trunk/pjnath/src/pjturn-srv/main.c

@@ -147 +147 @@
         return err("Error creating UDP listener", status);
 
+#if PJ_HAS_TCP
     status = pj_turn_listener_create_tcp(srv, pj_AF_INET(), NULL, 
                                          TURN_PORT, 1, 0, &listener);
     if (status != PJ_SUCCESS)
         return err("Error creating listener", status);
+#endif
 
     status = pj_turn_srv_add_listener(srv, listener);