Changeset 3028 for pjproject/trunk/pjnath/src/pjnath/turn_session.c

Timestamp:

Dec 8, 2009 1:11:25 PM (14 years ago)

Author:

bennylp

Message:

Fixed ticket #999:

Several bug fixes to the TURN client library and icedemo sample application:

1. ICE stream transport reports ICE initialization/candidate gathering stage as successful even when TURN client TCP connection has failed.
2. Bad ChannelData? framing when TCP is used. PJNATH did not properly add padding to the TURN ChannelData? packet if TCP is used and the data is not aligned to four bytes boundary. Similarly incoming ChannelData? with padding (over TCP) may not be handled correctly.
3. Incoming data over TCP may be delayed. PJNATH only processed one frame (be it request, indication, or ChannelData?) on an incoming stream, so if the stream contains more than one frames, the processing of subsequent frames will be delayed until more stream is received on the TCP transport.
4. The icedemo sample application overwrites the incoming packet buffer with NULL character ('\0') before printing the message to console. If there is another packet after current packet (as often happens when TCP is used), the subsequent packet will get corrupted.

The combinations of bugs above may cause PJNATH to return "Invalid STUN message length (PJNATH_EINSTUNMSGLEN)" error when processing incoming TURN ChannelData? message over TCP.

And a small enhancement:

1. Add logging to file option to icedemo sample.

Thanks Sarun Nandakumar for the report.

File:

• pjproject/trunk/pjnath/src/pjnath/turn_session.c (modified) (5 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_session.c

@@ -462 +462 @@
  * Forcefully destroy the TURN session.
  */
-PJ_DEF(pj_status_t) pj_turn_session_destroy( pj_turn_session *sess)
+PJ_DEF(pj_status_t) pj_turn_session_destroy( pj_turn_session *sess,
+                                             pj_status_t last_err)
 {
     PJ_ASSERT_RETURN(sess, PJ_EINVAL);
 
+    if (last_err != PJ_SUCCESS && sess->last_status == PJ_SUCCESS)
+        sess->last_status = last_err;
     set_state(sess, PJ_TURN_STATE_DEALLOCATED);
     sess_shutdown(sess, PJ_SUCCESS);
@@ -960 +963 @@
                            PJ_FALSE, PJ_FALSE);
     if (ch && ch->num != PJ_TURN_INVALID_CHANNEL && ch->bound) {
+        unsigned total_len;
+
         /* Peer is assigned a channel number, we can use ChannelData */
         pj_turn_channel_data *cd = (pj_turn_channel_data*)sess->tx_pkt;
@@ -965 +970 @@
         pj_assert(sizeof(*cd)==4);
 
-        if (pkt_len > sizeof(sess->tx_pkt)-sizeof(*cd)) {
+        /* Calculate total length, including paddings */
+        total_len = (pkt_len + sizeof(*cd) + 3) & (~3);
+        if (total_len > sizeof(sess->tx_pkt)) {
             status = PJ_ETOOBIG;
             goto on_return;
@@ -976 +983 @@
         pj_assert(sess->srv_addr != NULL);
 
-        status = sess->cb.on_send_pkt(sess, sess->tx_pkt, pkt_len+sizeof(*cd),
+        status = sess->cb.on_send_pkt(sess, sess->tx_pkt, total_len,
                                       sess->srv_addr,
                                       pj_sockaddr_get_len(sess->srv_addr));
@@ -1157 +1164 @@
         } else {
             if (parsed_len) {
-                *parsed_len = cd.length + sizeof(cd);
+                /* Apply padding too */
+                *parsed_len = ((cd.length + 3) & (~3)) + sizeof(cd);
             }
         }