winlin

remove the edge message flag, use directly send mode

@@ -313,7 +313,6 @@ SrsEdgeProxyContext::SrsEdgeProxyContext() @@ -313,7 +313,6 @@ SrsEdgeProxyContext::SrsEdgeProxyContext()
313 edge_io = NULL; 313 edge_io = NULL;
314 edge_rtmp = NULL; 314 edge_rtmp = NULL;
315 edge_stfd = NULL; 315 edge_stfd = NULL;
316 - edge_got_message = false;  
317 316
318 origin_stream_id = 0; 317 origin_stream_id = 0;
319 origin_io = NULL; 318 origin_io = NULL;
@@ -408,8 +407,6 @@ int SrsEdgeForwarder::proxy(SrsEdgeProxyContext* context) @@ -408,8 +407,6 @@ int SrsEdgeForwarder::proxy(SrsEdgeProxyContext* context)
408 context->origin_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US); 407 context->origin_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
409 context->edge_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US); 408 context->edge_rtmp->set_recv_timeout(SRS_RECV_TIMEOUT_US);
410 409
411 - context->edge_got_message = false;  
412 -  
413 SrsPithyPrint pithy_print(SRS_STAGE_EDGE); 410 SrsPithyPrint pithy_print(SRS_STAGE_EDGE);
414 411
415 pollfd fds[2]; 412 pollfd fds[2];
@@ -478,7 +475,6 @@ int SrsEdgeForwarder::proxy_origin_message(SrsEdgeProxyContext* context) @@ -478,7 +475,6 @@ int SrsEdgeForwarder::proxy_origin_message(SrsEdgeProxyContext* context)
478 srs_assert(msg); 475 srs_assert(msg);
479 476
480 if (msg->size <= 0 477 if (msg->size <= 0
481 - || !context->edge_got_message  
482 || msg->header.is_set_chunk_size() 478 || msg->header.is_set_chunk_size()
483 || msg->header.is_window_ackledgement_size() 479 || msg->header.is_window_ackledgement_size()
484 || msg->header.is_ackledgement() 480 || msg->header.is_ackledgement()
@@ -511,8 +507,6 @@ int SrsEdgeForwarder::proxy_edge_message(SrsEdgeProxyContext* context) @@ -511,8 +507,6 @@ int SrsEdgeForwarder::proxy_edge_message(SrsEdgeProxyContext* context)
511 507
512 srs_assert(msg); 508 srs_assert(msg);
513 509
514 - //context->edge_got_message = true;  
515 -  
516 if (msg->size <= 0 510 if (msg->size <= 0
517 || msg->header.is_set_chunk_size() 511 || msg->header.is_set_chunk_size()
518 || msg->header.is_window_ackledgement_size() 512 || msg->header.is_window_ackledgement_size()
@@ -108,7 +108,6 @@ public: @@ -108,7 +108,6 @@ public:
108 st_netfd_t edge_stfd; 108 st_netfd_t edge_stfd;
109 ISrsProtocolReaderWriter* edge_io; 109 ISrsProtocolReaderWriter* edge_io;
110 SrsRtmpServer* edge_rtmp; 110 SrsRtmpServer* edge_rtmp;
111 - bool edge_got_message;  
112 public: 111 public:
113 int origin_stream_id; 112 int origin_stream_id;
114 st_netfd_t origin_stfd; 113 st_netfd_t origin_stfd;