For #1657: Refine code

trunk/src/app/srs_app_http_conn.cpp

@@ -107,6 +107,55 @@ void SrsHttpConn::remark(int64_t* in, int64_t* out)
     kbps->remark(in, out);
 }
 
+srs_error_t SrsHttpConn::start()
+{
+    srs_error_t err = srs_success;
+
+    if ((err = skt->initialize()) != srs_success) {
+        return srs_error_wrap(err, "init socket");
+    }
+
+    if ((err = trd->start()) != srs_success) {
+        return srs_error_wrap(err, "coroutine");
+    }
+
+    return err;
+}
+
+srs_error_t SrsHttpConn::cycle()
+{
+    srs_error_t err = do_cycle();
+
+    // Notify handler to handle it.
+    handler_->on_conn_done();
+
+    // success.
+    if (err == srs_success) {
+        srs_trace("client finished.");
+        return err;
+    }
+
+    // It maybe success with message.
+    if (srs_error_code(err) == ERROR_SUCCESS) {
+        srs_trace("client finished%s.", srs_error_summary(err).c_str());
+        srs_freep(err);
+        return err;
+    }
+
+    // client close peer.
+    // TODO: FIXME: Only reset the error when client closed it.
+    if (srs_is_client_gracefully_close(err)) {
+        srs_warn("client disconnect peer. ret=%d", srs_error_code(err));
+    } else if (srs_is_server_gracefully_close(err)) {
+        srs_warn("server disconnect. ret=%d", srs_error_code(err));
+    } else {
+        srs_error("serve error %s", srs_error_desc(err).c_str());
+    }
+
+    srs_freep(err);
+    return srs_success;
+}
+
 srs_error_t SrsHttpConn::do_cycle()
 {
     srs_error_t err = srs_success;
@@ -169,40 +218,6 @@ srs_error_t SrsHttpConn::do_cycle()
     return err;
 }
 
-ISrsHttpConnOwner* SrsHttpConn::handler()
-{
-    return handler_;
-}
-
-srs_error_t SrsHttpConn::pull()
-{
-    return trd->pull();
-}
-
-srs_error_t SrsHttpConn::set_crossdomain_enabled(bool v)
-{
-    srs_error_t err = srs_success;
-
-    // initialize the cors, which will proxy to mux.
-    if ((err = cors->initialize(http_mux, v)) != srs_success) {
-        return srs_error_wrap(err, "init cors");
-    }
-
-    return err;
-}
-
-srs_error_t SrsHttpConn::set_jsonp(bool v)
-{
-    srs_error_t err = srs_success;
-
-    // initialize parser
-    if ((err = parser->initialize(HTTP_REQUEST, v)) != srs_success) {
-        return srs_error_wrap(err, "init parser for %s", ip.c_str());
-    }
-
-    return err;
-}
-
 srs_error_t SrsHttpConn::process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r)
 {
     srs_error_t err = srs_success;
@@ -224,63 +239,48 @@ srs_error_t SrsHttpConn::on_disconnect(SrsRequest* req)
     return srs_success;
 }
 
-srs_error_t SrsHttpConn::set_tcp_nodelay(bool v)
+ISrsHttpConnOwner* SrsHttpConn::handler()
 {
-    return skt->set_tcp_nodelay(v);
+    return handler_;
 }
 
-srs_error_t SrsHttpConn::set_socket_buffer(srs_utime_t buffer_v)
+srs_error_t SrsHttpConn::pull()
 {
-    return skt->set_socket_buffer(buffer_v);
+    return trd->pull();
 }
 
-srs_error_t SrsHttpConn::start()
+srs_error_t SrsHttpConn::set_crossdomain_enabled(bool v)
 {
     srs_error_t err = srs_success;
 
-    if ((err = skt->initialize()) != srs_success) {
-        return srs_error_wrap(err, "init socket");
-    }
-
-    if ((err = trd->start()) != srs_success) {
-        return srs_error_wrap(err, "coroutine");
+    // initialize the cors, which will proxy to mux.
+    if ((err = cors->initialize(http_mux, v)) != srs_success) {
+        return srs_error_wrap(err, "init cors");
     }
 
     return err;
 }
 
-srs_error_t SrsHttpConn::cycle()
+srs_error_t SrsHttpConn::set_jsonp(bool v)
 {
-    srs_error_t err = do_cycle();
-
-    // Notify handler to handle it.
-    handler_->on_conn_done();
+    srs_error_t err = srs_success;
 
-    // success.
-    if (err == srs_success) {
-        srs_trace("client finished.");
-        return err;
+    // initialize parser
+    if ((err = parser->initialize(HTTP_REQUEST, v)) != srs_success) {
+        return srs_error_wrap(err, "init parser for %s", ip.c_str());
     }
 
-    // It maybe success with message.
-    if (srs_error_code(err) == ERROR_SUCCESS) {
-        srs_trace("client finished%s.", srs_error_summary(err).c_str());
-        srs_freep(err);
     return err;
 }
 
-    // client close peer.
-    // TODO: FIXME: Only reset the error when client closed it.
-    if (srs_is_client_gracefully_close(err)) {
-        srs_warn("client disconnect peer. ret=%d", srs_error_code(err));
-    } else if (srs_is_server_gracefully_close(err)) {
-        srs_warn("server disconnect. ret=%d", srs_error_code(err));
-    } else {
-        srs_error("serve error %s", srs_error_desc(err).c_str());
+srs_error_t SrsHttpConn::set_tcp_nodelay(bool v)
+{
+    return skt->set_tcp_nodelay(v);
 }
 
-    srs_freep(err);
-    return srs_success;
+srs_error_t SrsHttpConn::set_socket_buffer(srs_utime_t buffer_v)
+{
+    return skt->set_socket_buffer(buffer_v);
 }
 
 string SrsHttpConn::remote_ip()

trunk/src/app/srs_app_http_conn.hpp

@@ -105,8 +105,20 @@ public:
 // Interface ISrsKbpsDelta
 public:
     virtual void remark(int64_t* in, int64_t* out);
+// Interface ISrsStartable
+public:
+    virtual srs_error_t start();
+// Interface ISrsOneCycleThreadHandler
+public:
+    virtual srs_error_t cycle();
 private:
     virtual srs_error_t do_cycle();
+private:
+    virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
+    // When the connection disconnect, call this method.
+    // e.g. log msg of connection and report to other system.
+    // @param request: request which is converted by the last http message.
+    virtual srs_error_t on_disconnect(SrsRequest* req);
 public:
     // Get the HTTP message handler.
     virtual ISrsHttpConnOwner* handler();
@@ -116,24 +128,11 @@ public:
     virtual srs_error_t set_crossdomain_enabled(bool v);
     // Whether enable the JSONP.
     virtual srs_error_t set_jsonp(bool v);
-private:
-    virtual srs_error_t process_request(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
-    // When the connection disconnect, call this method.
-    // e.g. log msg of connection and report to other system.
-    // @param request: request which is converted by the last http message.
-    virtual srs_error_t on_disconnect(SrsRequest* req);
-// Extract APIs from SrsTcpConnection.
 public:
     // Set socket option TCP_NODELAY.
     virtual srs_error_t set_tcp_nodelay(bool v);
     // Set socket option SO_SNDBUF in srs_utime_t.
     virtual srs_error_t set_socket_buffer(srs_utime_t buffer_v);
-// Interface ISrsStartable
-public:
-    virtual srs_error_t start();
-// Interface ISrsOneCycleThreadHandler
-public:
-    virtual srs_error_t cycle();
 // Interface ISrsConnection.
 public:
     virtual std::string remote_ip();