Changeset 5513 for pjproject/branches/projects/uwp/pjsip-apps/src/samples/pjsua2_demo.cpp

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/pjsua2_demo.cpp (modified) (4 diffs)

pjproject/branches/projects/uwp/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -126 +126 @@
     AccountConfig acc_cfg;
     acc_cfg.idUri = "sip:test1@pjsip.org";
-    acc_cfg.regConfig.registrarUri = "sip:pjsip.org";
+    acc_cfg.regConfig.registrarUri = "sip:sip.pjsip.org";
     acc_cfg.sipConfig.authCreds.push_back( AuthCredInfo("digest", "*",
                                                         "test1", 0, "test1") );
@@ -250 +250 @@
 
         accCfg.idUri = "\"Just Test\" <sip:test@pjsip.org>";
-        accCfg.regConfig.registrarUri = "sip:pjsip.org";
+        accCfg.regConfig.registrarUri = "sip:sip.pjsip.org";
         SipHeader h;
         h.hName = "X-Header";
@@ -292 +292 @@
 }
 
+
+static void mainProg4(Endpoint &ep) throw(Error)
+{
+    // Init library
+    EpConfig ep_cfg;
+    ep.libInit( ep_cfg );
+
+    // Create transport
+    TransportConfig tcfg;
+    tcfg.port = 5060;
+    ep.transportCreate(PJSIP_TRANSPORT_UDP, tcfg);
+    ep.transportCreate(PJSIP_TRANSPORT_TCP, tcfg);
+
+    // Add account
+    AccountConfig acc_cfg;
+    acc_cfg.idUri = "sip:localhost";
+    std::auto_ptr<MyAccount> acc(new MyAccount);
+    acc->create(acc_cfg);
+
+    // Start library
+    ep.libStart();
+    std::cout << "*** PJSUA2 STARTED ***" << std::endl;
+
+    // Just wait for ENTER key
+    std::cout << "Press ENTER to quit..." << std::endl;
+    std::cin.get();
+}
+
+
 int main()
 {
@@ -300 +329 @@
         ep.libCreate();
 
-        mainProg3(ep);
+        mainProg4(ep);
         ret = PJ_SUCCESS;
     } catch (Error & err) {