Changeset 993

Timestamp:

Feb 22, 2007 2:09:23 AM (17 years ago)

Author:

bennylp

Message:

Continuing work on the new STUN framework, partly implemented the client session

Location:

pjproject/trunk/pjlib-util

Files:

• build/pjlib_util.dsp (modified) (1 diff)
• build/pjlib_util.dsw (modified) (1 diff)
• build/pjstun_client.dsp (added)
• include/pjlib-util/stun_msg.h (modified) (4 diffs)
• include/pjlib-util/stun_transaction.h (modified) (4 diffs)
• src/pjlib-util/stun_msg_dump.c (added)
• src/pjlib-util/stun_transaction.c (modified) (2 diffs)
• src/pjstun-client (added)
• src/pjstun-client/client_main.c (added)
• src/pjstun-client/stun_session.c (added)
• src/pjstun-client/stun_session.h (added)

pjproject/trunk/pjlib-util/build/pjlib_util.dsp

@@ -138 +138 @@
 # Begin Source File
 
+SOURCE="..\src\pjlib-util\stun_msg_dump.c"
+# End Source File
+# Begin Source File
+
 SOURCE="..\src\pjlib-util\stun_server.c"
 # End Source File

pjproject/trunk/pjlib-util/build/pjlib_util.dsw

@@ -58 +58 @@
 ###############################################################################
 
+Project: "pjstun_client"=".\pjstun_client.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name pjlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name pjlib_util
+    End Project Dependency
+}}}
+
+###############################################################################
+
 Project: "pjstun_srv"=".\pjstun_srv.dsp" - Package Owner=<4>
 

pjproject/trunk/pjlib-util/include/pjlib-util/stun_msg.h

@@ -1191 +1191 @@
 
 /**
+ * Dump STUN message to a printable string output.
+ *
+ * @param msg           The STUN message
+ * @param buffer        Buffer where the printable string output will
+ *                      be printed on.
+ * @param length        On input, specify the maximum length of the buffer.
+ *                      On output, it will be filled up with the actual
+ *                      length of the output string.
+ *
+ * @return              The message string output.
+ */
+PJ_DECL(char*) pj_stun_msg_dump(const pj_stun_msg *msg,
+                                char *buffer,
+                                unsigned *length);
+
+
+/**
  * Find STUN attribute in the STUN message, starting from the specified
  * index.
  *
  * @param msg           The STUN message.
- * @param attr_type     The attribute type to be found.
+ * @param attr_type     The attribute type to be found, from pj_stun_attr_type.
  * @param start_index   The start index of the attribute in the message.
  *                      Specify zero to start searching from the first
@@ -1213 +1230 @@
  *
  * @param pool          The pool to allocate memory from.
- * @param attr_type     Attribute type.
+ * @param attr_type     Attribute type, from #pj_stun_attr_type.
  * @param xor_ed        If non-zero, the port and address will be XOR-ed
  *                      with magic, to make the XOR-MAPPED-ADDRESS attribute.
@@ -1235 +1252 @@
  *
  * @param pool          The pool to allocate memory from.
+ * @param attr_type     Attribute type, from #pj_stun_attr_type.
  * @param value         The string value to be assigned to the attribute.
  * @param p_attr        Pointer to receive the attribute.
@@ -1316 +1334 @@
  *
  * @param pool          The pool to allocate memory from.
- * @param attr_type     The attribute type.
+ * @param attr_type     The attribute type, from #pj_stun_attr_type.
  * @param p_attr        Pointer to receive the attribute.
  *

pjproject/trunk/pjlib-util/include/pjlib-util/stun_transaction.h

@@ -74 +74 @@
     void        (*on_complete)(pj_stun_client_tsx *tsx,
                                pj_status_t status, 
-                               pj_stun_msg *response);
+                               const pj_stun_msg *response);
 
     /**
@@ -125 +125 @@
 
 /**
+ * Check if transaction has completed.
+ *
+ * @param tsx           The STUN transaction.
+ *
+ * @return              Non-zero if transaction has completed.
+ */
+PJ_DECL(pj_bool_t) pj_stun_client_tsx_is_complete(pj_stun_client_tsx *tsx);
+
+
+/**
  * Associate an arbitrary data with the STUN transaction. This data
  * can be then retrieved later from the transaction, by using
@@ -187 +197 @@
  * @return              PJ_SUCCESS on success or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pj_stun_client_tsx_on_rx_msg(pj_stun_client_tsx *tsx,
+PJ_DECL(pj_status_t) pj_stun_client_tsx_on_rx_pkt(pj_stun_client_tsx *tsx,
                                                   const void *packet,
                                                   pj_size_t pkt_size,
@@ -193 +203 @@
 
 
+/**
+ * Notify the STUN transaction about the arrival of STUN response.
+ * If the STUN response contains a final error (300 and greater), the
+ * transaction will be terminated and callback will be called. If the
+ * STUN response contains response code 100-299, retransmission
+ * will  cease, but application must still call this function again
+ * with a final response later to allow the transaction to complete.
+ *
+ * @param tsx           The STUN client transaction instance.
+ * @param packet        The incoming packet.
+ * @param pkt_size      Size of the incoming packet.
+ * @param parsed_len    Optional pointer to receive the number of bytes
+ *                      that have been parsed from the incoming packet
+ *                      for the STUN message. This is useful if the
+ *                      STUN transaction is running over stream oriented
+ *                      socket such as TCP or TLS.
+ *
+ * @return              PJ_SUCCESS on success or the appropriate error code.
+ */
+PJ_DECL(pj_status_t) pj_stun_client_tsx_on_rx_msg(pj_stun_client_tsx *tsx,
+                                                  const pj_stun_msg *msg);
+
 
 /**

pjproject/trunk/pjlib-util/src/pjlib-util/stun_transaction.c

@@ -253 +253 @@
 
 
+
 /*
  * Notify the STUN transaction about the arrival of STUN response.
  */
 PJ_DEF(pj_status_t) pj_stun_client_tsx_on_rx_msg(pj_stun_client_tsx *tsx,
-                                                 const void *packet,
-                                                 pj_size_t pkt_size,
-                                                 unsigned *parsed_len)
-{
-    pj_stun_msg *msg;
+                                                 const pj_stun_msg *msg)
+{
     pj_stun_error_code_attr *err_attr;
     pj_status_t status;
-
-    PJ_ASSERT_RETURN(tsx && packet && pkt_size, PJ_EINVAL);
-
-    /* Try to parse the message */
-    status = pj_stun_msg_decode(tsx->pool, (const pj_uint8_t*)packet,
-                                pkt_size, 0, &msg, parsed_len,
-                                NULL, NULL, NULL);
-    if (status != PJ_SUCCESS) {
-        stun_perror(tsx, "STUN msg_decode() error", status);
-        return status;
-    }
 
     /* Must be STUN response message */
@@ -330 +317 @@
 
     return PJ_SUCCESS;
-}
-
+
+}
+
+
+/*
+ * Notify the STUN transaction about the arrival of STUN response.
+ */
+PJ_DEF(pj_status_t) pj_stun_client_tsx_on_rx_pkt(pj_stun_client_tsx *tsx,
+                                                 const void *packet,
+                                                 pj_size_t pkt_size,
+                                                 unsigned *parsed_len)
+{
+    pj_stun_msg *msg;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(tsx && packet && pkt_size, PJ_EINVAL);
+
+    /* Try to parse the message */
+    status = pj_stun_msg_decode(tsx->pool, (const pj_uint8_t*)packet,
+                                pkt_size, 0, &msg, parsed_len,
+                                NULL, NULL, NULL);
+    if (status != PJ_SUCCESS) {
+        stun_perror(tsx, "STUN msg_decode() error", status);
+        return status;
+    }
+
+    return pj_stun_client_tsx_on_rx_msg(tsx, msg);
+}
+