Changeset 105 for pjproject/trunk/pjsip/include/pjsip/sip_transport.h

Timestamp:

Dec 26, 2005 12:52:19 PM (18 years ago)

Author:

bennylp

Message:

Modify transport to use generic sockaddr address

File:

• pjproject/trunk/pjsip/include/pjsip/sip_transport.h (modified) (8 diffs)

pjproject/trunk/pjsip/include/pjsip/sip_transport.h

@@ -175 +175 @@
 
         /** The source address from which the packet was received. */
-        pj_sockaddr_in           addr;
+        pj_sockaddr              src_addr;
 
         /** The length of the source address. */
-        int                      addr_len;
+        int                      src_addr_len;
+
+        /** The IP source address string (NULL terminated). */
+        char                     src_name[16];
+
+        /** The IP source port number. */
+        int                      src_port;
 
     } pkt_info;
@@ -408 +414 @@
     int                     tracing;        /**< Tracing enabled?           */
 
-    pjsip_transport_type_e  type;           /**< Transport type.            */
-    char                    type_name[8];   /**< Type name.                 */
+    /** Key for indexing this transport in hash table. */
+    struct {
+        pjsip_transport_type_e  type;       /**< Transport type.            */
+        pj_sockaddr             rem_addr;   /**< Remote addr (zero for UDP) */
+    } key;
+
+    char                   *type_name;      /**< Type name.                 */
     unsigned                flag;           /**< #pjsip_transport_flags_e   */
-
-    pj_sockaddr_in          local_addr;     /**< Bound address.             */
-    pj_sockaddr_in          public_addr;    /**< STUN addres.               */
-    pj_sockaddr_in          rem_addr;       /**< Remote addr (zero for UDP) */
-
+    char                   *info;           /**< Transport info/description.*/
+
+    int                     addr_len;       /**< Length of addresses.       */
+    pj_sockaddr             local_addr;     /**< Bound address.             */
+    pjsip_host_port         local_name;     /**< Published name (eg. STUN). */
+    pjsip_host_port         remote_name;    /**< Remote address name.       */
+    
     pjsip_endpoint         *endpt;          /**< Endpoint instance.         */
     pjsip_tpmgr            *tpmgr;          /**< Transport manager.         */
@@ -429 +442 @@
      *                      caller when pending send operation completes.
      * @param rem_addr      The remote destination address.
+     * @param addr_len      Size of remote address.
      * @param callback      If supplied, the callback will be called
      *                      once a pending transmission has completed. If
@@ -447 +461 @@
     pj_status_t (*send_msg)(pjsip_transport *transport, 
                             pjsip_tx_data *tdata,
-                            const pj_sockaddr_in *rem_addr,
+                            const pj_sockaddr_t *rem_addr,
+                            int addr_len,
                             void *token,
                             void (*callback)(pjsip_transport *transport,
@@ -523 +538 @@
     unsigned                flag;
 
-    pj_sockaddr_in          local_addr;
-    pj_sockaddr_in          public_addr;
+    pj_sockaddr             local_addr;
+    pjsip_host_port         addr_name;
 
     /**
@@ -532 +547 @@
                                     pjsip_tpmgr *mgr,
                                     pjsip_endpoint *endpt,
-                                    const pj_sockaddr_in *rem_addr,
+                                    const pj_sockaddr *rem_addr,
                                     pjsip_transport **transport);
 
@@ -608 +623 @@
  */
 PJ_DECL(pj_status_t) pjsip_tpmgr_alloc_transport( pjsip_tpmgr *mgr,
-                                           pjsip_transport_type_e type,
-                                           const pj_sockaddr_in *remote,
-                                           pjsip_transport **p_transport );
+                                                  pjsip_transport_type_e type,
+                                                  const pj_sockaddr_t *remote,
+                                                  int addr_len,
+                                                  pjsip_transport **p_transport );
 
 
@@ -618 +634 @@
 PJ_DECL(pj_status_t) pjsip_transport_send( pjsip_transport *tr, 
                                            pjsip_tx_data *tdata,
-                                           const pj_sockaddr_in *addr,
+                                           const pj_sockaddr_t *addr,
+                                           int addr_len,
                                            void *token,
                                            void (*cb)(void *token,