Changeset 3841 for pjproject/trunk/pjlib-util/src/pjlib-util/http_client.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjlib-util/src/pjlib-util/http_client.c (modified) (11 diffs)

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

@@ -27 +27 @@
 #include <pj/string.h>
 #include <pj/timer.h>
+#include <pj/rand.h>
 #include <pjlib-util/base64.h>
 #include <pjlib-util/errno.h>
@@ -33 +34 @@
 #include <pjlib-util/string.h>
 
+#define THIS_FILE   "http_client.c"
+
 #if 0
     /* Enable some tracing */
-    #define THIS_FILE   "http_client.c"
     #define TRACE_(arg) PJ_LOG(3,arg)
 #else
@@ -765 +767 @@
     param->timeout.msec = PJ_HTTP_DEFAULT_TIMEOUT;
     pj_time_val_normalize(&param->timeout);
+    param->max_retries = 3;
 }
 
@@ -1005 +1008 @@
 }
 
-PJ_DEF(pj_status_t) pj_http_req_start(pj_http_req *http_req)
+static pj_status_t start_http_req(pj_http_req *http_req,
+                                  pj_bool_t notify_on_fail)
 {
     pj_sock_t sock = PJ_INVALID_SOCKET;
     pj_status_t status;
     pj_activesock_cb asock_cb;
+    int retry = 0;
 
     PJ_ASSERT_RETURN(http_req, PJ_EINVAL);
@@ -1032 +1037 @@
              http_req->addr.ipv4.sin_addr.s_addr==PJ_INADDR_NONE))
         {
-            return status; // cannot resolve host name
+            goto on_return;
         }
         http_req->resolved = PJ_TRUE;
@@ -1046 +1051 @@
     asock_cb.on_data_sent = &http_on_data_sent;
     asock_cb.on_connect_complete = &http_on_connect;
+        
+    do
+    {
+        pj_sockaddr_in bound_addr;
+        pj_uint16_t port = 0;
+
+        /* If we are using port restriction.
+         * Get a random port within the range
+         */
+        if (http_req->param.source_port_range_start != 0) {
+            port = (pj_uint16_t)
+                   (http_req->param.source_port_range_start +
+                    (pj_rand() % http_req->param.source_port_range_size));
+        }
+
+        pj_sockaddr_in_init(&bound_addr, NULL, port);
+        status = pj_sock_bind(sock, &bound_addr, sizeof(bound_addr));
+
+    } while (status != PJ_SUCCESS && (retry++ < http_req->param.max_retries));
+
+    if (status != PJ_SUCCESS) {
+        PJ_PERROR(1,(THIS_FILE, status,
+                     "Unable to bind to the requested port"));
+        pj_sock_close(sock);
+        goto on_return;
+    }
 
     // TODO: should we set whole data to 0 by default?
@@ -1053 +1084 @@
                                   &asock_cb, http_req, &http_req->asock);
     if (status != PJ_SUCCESS) {
-        if (sock != PJ_INVALID_SOCKET)
-            pj_sock_close(sock);
+        pj_sock_close(sock);
         goto on_return; // error creating activesock
     }
@@ -1075 +1105 @@
     if (status == PJ_SUCCESS) {
         http_req->state = SENDING_REQUEST;
-        return http_req_start_sending(http_req);
+        status =  http_req_start_sending(http_req);
+        if (status != PJ_SUCCESS)
+            goto on_return;
     } else if (status != PJ_EPENDING) {
         goto on_return; // error connecting
@@ -1083 +1115 @@
 
 on_return:
-    http_req_end_request(http_req);
+    http_req->error = status;
+    if (notify_on_fail)
+        pj_http_req_cancel(http_req, PJ_TRUE);
+    else
+        http_req_end_request(http_req);
+
     return status;
+}
+
+/* Starts an asynchronous HTTP request to the URL specified. */
+PJ_DEF(pj_status_t) pj_http_req_start(pj_http_req *http_req)
+{
+    return start_http_req(http_req, PJ_FALSE);
 }
 
@@ -1346 +1389 @@
         const pj_str_t STR_MD5 = { "MD5", 3 };
         const pj_str_t qop = pj_str("auth");
-        const pj_str_t nc = pj_str("1");
+        const pj_str_t nc = pj_str("00000001");
         const pj_str_t cnonce = pj_str("b39971");
 
@@ -1434 +1477 @@
     http_req_end_request(hreq);
 
-    status = pj_http_req_start(hreq);
+    status = start_http_req(hreq, PJ_TRUE);
     if (status != PJ_SUCCESS)
         goto on_error;