Changeset 1888

Timestamp:

Mar 22, 2008 9:33:26 AM (17 years ago)

Author:

bennylp

Message:

Added comment about byte ordering in TURN CHANNEL-NUMBER attribute and modified select() parameter in TURN client

Location:

pjproject/trunk/pjnath

Files:

• include/pjnath/stun_msg.h (modified) (2 diffs)
• src/pjturn-client/client_main.c (modified) (2 diffs)

pjproject/trunk/pjnath/include/pjnath/stun_msg.h

@@ -873 +873 @@
 /**
  * Get 16bit channel number from 32bit integral value.
+ * Note that uint32 attributes are always stored in host byte order
+ * after they have been parsed from the PDU, so no need to do ntohs()
+ * here.
  */
 #define PJ_STUN_GET_CH_NB(u32)      ((pj_uint16_t)(u32>>16))
@@ -878 +881 @@
 /**
  * Convert 16bit channel number into 32bit integral value.
+ * Note that uint32 attributes will be converted to network byte order
+ * when the attribute is written to packet, so no need to do htons()
+ * here.
  */
 #define PJ_STUN_SET_CH_NB(chnum)    (((pj_uint32_t)chnum) << 16)

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

@@ -191 +191 @@
     while (!g.quit) {
         const pj_time_val delay = {0, 10};
-        int i;
+        int i, n=0;
         pj_fd_set_t readset;
 
@@ -204 +204 @@
         for (i=0; i<PJ_ARRAY_SIZE(g.peer); ++i) {
             PJ_FD_SET(g.peer[i].sock, &readset);
+            if (g.peer[i].sock > n)
+                n = g.peer[i].sock;
         }
 
-        if (pj_sock_select(64, &readset, NULL, NULL, &delay) <= 0)
+        if (pj_sock_select(n+1, &readset, NULL, NULL, &delay) <= 0)
             continue;