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

Timestamp:

Nov 19, 2005 1:20:08 PM (18 years ago)

Author:

bennylp

Message:

Added UDP transport implementation

File:

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

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

@@ -117 +117 @@
  *****************************************************************************/
 
+/** 
+ * A customized ioqueue async operation key which is used by transport
+ * to locate rdata when a pending read operation completes.
+ */
+typedef struct pjsip_rx_data_op_key
+{
+    pj_ioqueue_op_key_t         op_key;
+    pjsip_rx_data              *rdata;
+} pjsip_rx_data_op_key;
+
+
 /**
  * Incoming message buffer.
@@ -140 +151 @@
 
         /** Ioqueue key. */
-        pj_ioqueue_op_key_t      op_key;
+        pjsip_rx_data_op_key     op_key;
 
     } tp_info;
@@ -250 +261 @@
  *****************************************************************************/
 
+/** Customized ioqueue async operation key, used by transport to keep
+ *  callback parameters.
+ */
+typedef struct pjsip_tx_data_op_key
+{
+    pj_ioqueue_op_key_t     key;
+    pjsip_tx_data          *tdata;
+    void                   *token;
+    void                  (*callback)(pjsip_transport*,void*,pj_ssize_t);
+} pjsip_tx_data_op_key;
+
+
 /**
  * Data structure for sending outgoing message. Application normally creates
@@ -266 +289 @@
 struct pjsip_tx_data
 {
+    /** This is for transmission queue; it's managed by transports. */
     PJ_DECL_LIST_MEMBER(struct pjsip_tx_data);
 
@@ -285 +309 @@
 
     /** Ioqueue asynchronous operation key. */
-    pj_ioqueue_op_key_t  op_key;
+    pjsip_tx_data_op_key op_key;
 
     /** Lock object. */
@@ -304 +328 @@
     pj_atomic_t         *ref_cnt;
 
-    /** Being sent? */
+    /** Being processed by transport? */
     int                  is_pending;
 
-    /** Transport internal. */
+    /** Transport manager internal. */
     void                *token;
     void               (*cb)(void*, pjsip_tx_data*, pj_status_t);
@@ -392 +416 @@
     pj_sockaddr_in          rem_addr;       /**< Remote addr (zero for UDP) */
 
+    pjsip_endpoint         *endpt;          /**< Endpoint instance.         */
     pjsip_tpmgr            *tpmgr;          /**< Transport manager.         */
     pj_timer_entry          idle_timer;     /**< Timer when ref cnt is zero.*/
@@ -421 +446 @@
      */
     pj_status_t (*send_msg)(pjsip_transport *transport, 
-                            const void *packet, 
-                            pj_size_t length,
-                            pj_ioqueue_op_key_t *op_key,
+                            pjsip_tx_data *tdata,
                             const pj_sockaddr_in *rem_addr,
                             void *token,
                             void (*callback)(pjsip_transport *transport,
                                              void *token, 
-                                             pj_status_t status));
+                                             pj_ssize_t sent_bytes));
 
     /**
@@ -509 +532 @@
                                     pjsip_tpmgr *mgr,
                                     pjsip_endpoint *endpt,
-                                    pj_ioqueue_t *ioqueue,
                                     const pj_sockaddr_in *rem_addr,
                                     pjsip_transport **transport);
@@ -556 +578 @@
 PJ_DECL(pj_status_t) pjsip_tpmgr_create( pj_pool_t *pool,
                                          pjsip_endpoint * endpt,
-                                         pj_ioqueue_t *ioqueue,
-                                         pj_timer_heap_t *timer_heap,
                                          void (*cb)(pjsip_endpoint*,
                                                     pj_status_t,
@@ -602 +622 @@
                                            void (*cb)(void *token, 
                                                       pjsip_tx_data *tdata,
-                                                      pj_status_t));
+                                                      pj_ssize_t bytes_sent));