Changeset 1387 for pjproject

Timestamp:

Jun 23, 2007 4:22:51 AM (17 years ago)

Author:

bennylp

Message:

Ticket #341: implemented pjsip_send_raw_data() function to send raw data to a destination

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_transport.h (modified) (5 diffs)
• src/pjsip/sip_transport.c (modified) (1 diff)

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

@@ -905 +905 @@
 typedef pj_status_t (*pjsip_tx_callback)(pjsip_endpoint*, pjsip_tx_data*);
 /**
- * Create a new transport manager.
+ * Create a transport manager. Normally application doesn't need to call
+ * this function directly, since a transport manager will be created and
+ * destroyed automatically by the SIP endpoint.
  *
  * @param pool      Pool.
@@ -960 +962 @@
 
 /**
- * Destroy transport manager.
+ * Destroy a transport manager. Normally application doesn't need to call
+ * this function directly, since a transport manager will be created and
+ * destroyed automatically by the SIP endpoint.
+ *
+ * @param mgr       The transport manager.
+ *
+ * @return          PJ_SUCCESS on success.
  */
 PJ_DECL(pj_status_t) pjsip_tpmgr_destroy(pjsip_tpmgr *mgr);
@@ -966 +974 @@
 
 /**
- * Dump transport info.
+ * Dump transport info and status to log.
+ *
+ * @param mgr       The transport manager.
  */
 PJ_DECL(void) pjsip_tpmgr_dump_transports(pjsip_tpmgr *mgr);
@@ -1003 +1013 @@
                                                    pjsip_transport **tp);
 
+/**
+ * Type of callback to receive notification when message or raw data
+ * has been sent.
+ *
+ * @param token         The token that was given when calling the function
+ *                      to send message or raw data.
+ * @param tdata         The transmit buffer used to send the message.
+ * @param bytes_sent    Number of bytes sent. On success, the value will be
+ *                      positive number indicating the number of bytes sent.
+ *                      On failure, the value will be a negative number of
+ *                      the error code (i.e. bytes_sent = -status).
+ */
 typedef void (*pjsip_tp_send_callback)(void *token, pjsip_tx_data *tdata,
-                                                                           pj_ssize_t bytes_sent);
-/**
- * Send a SIP message using the specified transport.
+                                       pj_ssize_t bytes_sent);
+
+
+/**
+ * This is a low-level function to send a SIP message using the specified
+ * transport to the specified destination.
+ * 
+ * @param tr        The SIP transport to be used.
+ * @param tdata     Transmit data buffer containing SIP message.
+ * @param addr      Destination address.
+ * @param addr_len  Length of destination address.
+ * @param token     Arbitrary token to be returned back to callback.
+ * @param cb        Optional callback to be called to notify caller about
+ *                  the completion status of the pending send operation.
+ *
+ * @return          If the message has been sent successfully, this function
+ *                  will return PJ_SUCCESS and the callback will not be 
+ *                  called. If message cannot be sent immediately, this
+ *                  function will return PJ_EPENDING, and application will
+ *                  be notified later about the completion via the callback.
+ *                  Any statuses other than PJ_SUCCESS or PJ_EPENDING
+ *                  indicates immediate failure, and in this case the 
+ *                  callback will not be called.
  */
 PJ_DECL(pj_status_t) pjsip_transport_send( pjsip_transport *tr, 
@@ -1017 +1059 @@
 
 /**
+ * This is a low-level function to send raw data using the specified transport
+ * to the specified destination.
+ *
+ * @param tr        The SIP transport to be used.
+ * @param raw_data  The data to be sent.
+ * @param data_len  The length of the data.
+ * @param addr      Destination address.
+ * @param addr_len  Length of destination address.
+ * @param token     Arbitrary token to be returned back to callback.
+ * @param cb        Optional callback to be called to notify caller about
+ *                  the completion status of the pending send operation.
+ *
+ * @return          If the message has been sent successfully, this function
+ *                  will return PJ_SUCCESS and the callback will not be 
+ *                  called. If message cannot be sent immediately, this
+ *                  function will return PJ_EPENDING, and application will
+ *                  be notified later about the completion via the callback.
+ *                  Any statuses other than PJ_SUCCESS or PJ_EPENDING
+ *                  indicates immediate failure, and in this case the 
+ *                  callback will not be called.
+ */
+PJ_DECL(pj_status_t) pjsip_transport_send_raw(pjsip_transport *tr,
+                                              const void *raw_data,
+                                              pj_size_t data_len,
+                                              const pj_sockaddr_t *addr,
+                                              int addr_len,
+                                              void *token,
+                                              pjsip_tp_send_callback cb);
+
+
+/**
  * @}
  */

pjproject/trunk/pjsip/src/pjsip/sip_transport.c

@@ -602 +602 @@
     return status;
 }
+
+
+/* Send raw data */
+PJ_DEF(pj_status_t) pjsip_transport_send_raw(pjsip_transport *tr,
+                                             const void *raw_data,
+                                             pj_size_t data_len,
+                                             const pj_sockaddr_t *addr,
+                                             int addr_len,
+                                             void *token,
+                                             pjsip_tp_send_callback cb)
+{
+    pjsip_tx_data *tdata;
+    pj_status_t status;
+ 
+    status = pjsip_endpt_create_tdata(tr->endpt, &tdata);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Add reference counter. */
+    pjsip_tx_data_add_ref(tdata);
+ 
+    /* Allocate buffer */
+    tdata->buf.start = (char*) pj_pool_alloc(tdata->pool, data_len);
+    tdata->buf.end = tdata->buf.start + data_len;
+ 
+    /* Copy data */
+    pj_memcpy(tdata->buf.start, raw_data, data_len);
+    tdata->buf.cur = tdata->buf.start + data_len;
+ 
+    /* Save callback data. */
+    tdata->token = token;
+    tdata->cb = cb;
+
+    /* Mark as pending. */
+    tdata->is_pending = 1;
+
+    /* Send to transoprt */
+    status = tr->send_msg(tr, tdata, addr, addr_len,
+                          tdata, &transport_send_callback);
+ 
+    if (status != PJ_EPENDING) {
+        /* callback will not be called, so destroy tdata now. */
+        pjsip_tx_data_dec_ref(tdata);
+    }
+
+    return status;
+}
+
 
 static void transport_idle_callback(pj_timer_heap_t *timer_heap,