RTC: Use isolate cid for UDP mux listener

trunk/src/app/srs_app_listener.cpp

@@ -416,6 +416,7 @@ SrsUdpMuxListener::SrsUdpMuxListener(ISrsUdpMuxHandler* h, std::string i, int p)
     buf = new char[nb_buf];
 
     trd = new SrsDummyCoroutine();
+    cid = _srs_context->generate_id();
 }
 
 SrsUdpMuxListener::~SrsUdpMuxListener()
@@ -443,10 +444,8 @@ srs_error_t SrsUdpMuxListener::listen()
         return srs_error_wrap(err, "listen %s:%d", ip.c_str(), port);
     }
     
-    set_socket_buffer();
-    
     srs_freep(trd);
-    trd = new SrsSTCoroutine("udp", this);
+    trd = new SrsSTCoroutine("udp", this, cid);
     if ((err = trd->start()) != srs_success) {
         return srs_error_wrap(err, "start thread");
     }
@@ -507,6 +506,8 @@ srs_error_t SrsUdpMuxListener::cycle()
     uint64_t nn_loop = 0;
     srs_utime_t time_last = srs_get_system_time();
 
+    set_socket_buffer();
+    
     while (true) {
         if ((err = trd->pull()) != srs_success) {
             return srs_error_wrap(err, "udp listener");
@@ -532,7 +533,12 @@ srs_error_t SrsUdpMuxListener::cycle()
         nn_msgs++;
         nn_msgs_stage++;
 
-        if ((err = handler->on_udp_packet(&skt)) != srs_success) {
+        // Restore context when packets processed.
+        if (true) {
+            SrsContextRestore(cid);
+            err = handler->on_udp_packet(&skt);
+        }
+        if (err != srs_success) {
             // remux udp never return
             srs_warn("udp packet handler error:%s", srs_error_desc(err).c_str());
             srs_error_reset(err);

trunk/src/app/srs_app_listener.hpp

@@ -163,13 +163,14 @@ public:
 
 class SrsUdpMuxListener : public ISrsCoroutineHandler
 {
-protected:
+private:
     srs_netfd_t lfd;
     SrsCoroutine* trd;
-protected:
+    SrsContextId cid;
+private:
     char* buf;
     int nb_buf;
-protected:
+private:
     ISrsUdpMuxHandler* handler;
     std::string ip;
     int port;