Changeset 1054 for pjproject/trunk/pjlib-util/include/pjlib-util/stun_msg.h

Timestamp:

Mar 10, 2007 11:15:36 PM (17 years ago)

Author:

bennylp

Message:

Completed and tested (simple test) the TURN server and command line STUN/TURN client

File:

• pjproject/trunk/pjlib-util/include/pjlib-util/stun_msg.h (modified) (19 diffs)

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

@@ -270 +270 @@
      * STUN/TURN Send Indication
      */
-    PJ_STUN_SEND_INDICATION                 = 0x0004,
+    PJ_STUN_SEND_INDICATION                 = 0x0014,
 
     /**
      * STUN/TURN Data Indication
      */
-    PJ_STUN_DATA_INDICATION                 = 0x0115,
+    PJ_STUN_DATA_INDICATION                 = 0x0015,
 
     /**
@@ -310 +310 @@
      * STUN/TURN Connect Status Indication
      */
-    PJ_STUN_CONNECT_STATUS_INDICATION       = 0x0118
+    PJ_STUN_CONNECT_STATUS_INDICATION       = 0x0018
 
 
@@ -516 +516 @@
    \endverbatim
  */
-typedef struct pj_stun_ip_addr_attr
+typedef struct pj_stun_sockaddr_attr
 {
     /**
@@ -522 +522 @@
      */
     pj_stun_attr_hdr    hdr;
+
+    /**
+     * Flag to indicate whether this attribute should be sent in XOR-ed
+     * format, or has been received in XOR-ed format.
+     */
+    pj_bool_t           xor_ed;
 
     /**
@@ -532 +538 @@
     } addr;
 
-} pj_stun_ip_addr_attr;
+} pj_stun_sockaddr_attr;
 
 
@@ -745 +751 @@
  * The MAPPED-ADDRESS attribute indicates the mapped transport address.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_mapped_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_mapped_addr_attr;
 
 
@@ -757 +763 @@
  * through NATs which would otherwise interfere with STUN.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_xor_mapped_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_xor_mapped_addr_attr;
 
 
@@ -777 +783 @@
  * MAPPED-ADDRESS.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_alt_server_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_alt_server_attr;
 
 
@@ -798 +804 @@
  * RFC 3489-bis standard.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_response_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_response_addr_attr;
 
 
@@ -813 +819 @@
  * RFC 3489-bis standard.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_changed_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_changed_addr_attr;
 
 
@@ -845 +851 @@
  * RFC 3489-bis standard.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_src_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_src_addr_attr;
 
 
@@ -857 +863 @@
  * denial-of-service attacks.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_reflected_from_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_reflected_from_attr;
 
 
@@ -902 +908 @@
  * from the STUN relay server.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_remote_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_remote_addr_attr;
 
 
@@ -920 +926 @@
  * address and port that the server allocated to the client.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_relay_addr_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_relay_addr_attr;
 
 
@@ -976 +982 @@
  * specific IP address be allocated to it.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_req_ip_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_req_ip_attr;
 
 /**
@@ -988 +994 @@
  * to XOR-MAPPED-ADDRESS.
  */
-typedef struct pj_stun_ip_addr_attr pj_stun_xor_reflected_from_attr;
+typedef struct pj_stun_sockaddr_attr pj_stun_xor_reflected_from_attr;
 
 /**
@@ -1016 +1022 @@
  * the STUN-aware NATs along the path.
  */
-typedef pj_stun_ip_addr_attr pj_stun_xor_internal_addr_attr;
+typedef pj_stun_sockaddr_attr pj_stun_xor_internal_addr_attr;
 
 /**
@@ -1305 +1311 @@
  * @return              PJ_SUCCESS on success or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pj_stun_ip_addr_attr_create(pj_pool_t *pool,
+PJ_DECL(pj_status_t) pj_stun_sockaddr_attr_create(pj_pool_t *pool,
                                                 int attr_type, 
                                                 pj_bool_t xor_ed,
                                                 const pj_sockaddr_t *addr,
                                                 unsigned addr_len,
-                                                pj_stun_ip_addr_attr **p_attr);
+                                                pj_stun_sockaddr_attr **p_attr);
 
 
@@ -1328 +1334 @@
  * @return              PJ_SUCCESS on success or the appropriate error code.
  */
-PJ_DECL(pj_status_t) pj_stun_msg_add_ip_addr_attr(pj_pool_t *pool,
+PJ_DECL(pj_status_t) pj_stun_msg_add_sockaddr_attr(pj_pool_t *pool,
                                                   pj_stun_msg *msg,
                                                   int attr_type,