Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/samples/siprtp.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip-apps/src/samples/siprtp.c (modified) (8 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/samples/siprtp.c

@@ -638 +638 @@
 
     /* Create UAS dialog */
-    status = pjsip_dlg_create_uas( pjsip_ua_instance(), rdata,
-                                   &app.local_contact, &dlg);
+    status = pjsip_dlg_create_uas_and_inc_lock( pjsip_ua_instance(), rdata,
+                                                &app.local_contact, &dlg);
     if (status != PJ_SUCCESS) {
         const pj_str_t reason = pj_str("Unable to create dialog");
@@ -656 +656 @@
         pjsip_dlg_create_response(dlg, rdata, 500, NULL, &tdata);
         pjsip_dlg_send_response(dlg, pjsip_rdata_get_tsx(rdata), tdata);
+        pjsip_dlg_dec_lock(dlg);
         return;
     }
     
+    /* Invite session has been created, decrement & release dialog lock */
+    pjsip_dlg_dec_lock(dlg);
 
     /* Attach call data to invite session */
@@ -845 +848 @@
 static pj_status_t init_options(int argc, char *argv[])
 {
-    static char ip_addr[32];
+    static char ip_addr[PJ_INET_ADDRSTRLEN];
     static char local_uri[64];
 
@@ -886 +889 @@
         const pj_str_t *hostname;
         pj_sockaddr_in tmp_addr;
-        char *addr;
 
         hostname = pj_gethostname();
         pj_sockaddr_in_init(&tmp_addr, hostname, 0);
-        addr = pj_inet_ntoa(tmp_addr.sin_addr);
-        pj_ansi_strcpy(ip_addr, addr);
+        pj_inet_ntop(pj_AF_INET(), &tmp_addr.sin_addr, ip_addr,
+                     sizeof(ip_addr));
     }
 
@@ -1134 +1136 @@
         return;
     }
-    tp.__sched_priority = max_prio;
+    tp.sched_priority = max_prio;
 
     rc = sched_setscheduler(0, POLICY, &tp);
@@ -1143 +1145 @@
 
     PJ_LOG(4, (THIS_FILE, "New process policy=%d, priority=%d",
-              policy, tp.__sched_priority));
+              policy, tp.sched_priority));
 
     /*
@@ -1156 +1158 @@
 
     PJ_LOG(4, (THIS_FILE, "Old thread policy=%d, priority=%d",
-              policy, tp.__sched_priority));
+              policy, tp.sched_priority));
 
     policy = POLICY;
-    tp.__sched_priority = max_prio;
+    tp.sched_priority = max_prio;
 
     rc = pthread_setschedparam(pthread_self(), policy, &tp);
@@ -1169 +1171 @@
 
     PJ_LOG(4, (THIS_FILE, "New thread policy=%d, priority=%d",
-              policy, tp.__sched_priority));
+              policy, tp.sched_priority));
 }