From 1cf5fb6ba3f75c2b949962f9c12b39430c7ae2dc Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 May 2019 20:25:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- a8/tcplistener.cc | 2 +- a8/websocketsession.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/a8/tcplistener.cc b/a8/tcplistener.cc index 4a14365..9950728 100644 --- a/a8/tcplistener.cc +++ b/a8/tcplistener.cc @@ -88,7 +88,7 @@ namespace a8 memset(&sa, 0, sizeof(sa)); sa.sin_family = AF_INET; sa.sin_addr.s_addr = ::inet_addr(master->bind_address.c_str()); - sa.sin_port = ::htons(master->bind_port); + sa.sin_port = htons(master->bind_port); if (::bind(listen_socket, (sockaddr*)&sa, sizeof(sa)) < 0) { diff --git a/a8/websocketsession.cc b/a8/websocketsession.cc index 5567291..521dfd8 100644 --- a/a8/websocketsession.cc +++ b/a8/websocketsession.cc @@ -228,11 +228,11 @@ namespace a8 framelen = payloadlen; mask_offset = 2; } else if (payloadlen == 126 && ava_len >= 4) { - framelen = ::ntohs( *(u_short*) (real_buf + 2) ); + framelen = ntohs( *(u_short*) (real_buf + 2) ); mask_offset = 4; } else if (payloadlen == 127 && ava_len >= 8) { //int32 or int64? - framelen = ::ntohl( *(u_long*) (real_buf + 2) ); + framelen = ntohl( *(u_long*) (real_buf + 2) ); mask_offset = 8; } else { return;