Fix channel creation got stuck

Changes:
  * Add a small delay before running the viewer to avoid race condition
    that leads to getting stuck in channel creation
  * Fix typo in viewer's configuration

Author: lherman-cs

webrtc-c/canary/src/CanaryWebrtc.cpp

@@ -133,14 +133,16 @@ STATUS run(Canary::PConfig pConfig)
         viewerConfig.isMaster.value = FALSE;
 
         ss << pConfig->clientId.value << "Viewer";
-        masterConfig.clientId.value = ss.str();
+        viewerConfig.clientId.value = ss.str();
         ss.str("");
 
         ss << pConfig->channelName.value << "-viewer-" << timestamp;
-        masterConfig.logStreamName.value = ss.str();
+        viewerConfig.logStreamName.value = ss.str();
         ss.str("");
 
         std::thread masterThread(runPeer, &masterConfig, timerQueueHandle, &masterRetStatus);
+        THREAD_SLEEP(CANARY_DEFAULT_VIEWER_INIT_DELAY);
+
         runPeer(&viewerConfig, timerQueueHandle, &retStatus);
         masterThread.join();
 

webrtc-c/canary/src/Include.h

@@ -42,6 +42,8 @@
 
 #define CANARY_DEFAULT_ITERATION_DURATION_IN_SECONDS 30
 
+#define CANARY_DEFAULT_VIEWER_INIT_DELAY (5 * HUNDREDS_OF_NANOS_IN_A_SECOND)
+
 #define CANARY_MIN_DURATION           (30 * HUNDREDS_OF_NANOS_IN_A_SECOND)
 #define CANARY_MIN_ITERATION_DURATION (15 * HUNDREDS_OF_NANOS_IN_A_SECOND)