server_common/a8
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

兼容release

Browse Source
This commit is contained in:
aozhiwei 2019-05-24 20:25:55 +08:00
parent ff8c00652d
commit 1cf5fb6ba3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
a8/tcplistener.cc
View File

@ -88,7 +88,7 @@ namespace a8
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sa.sin_family = AF_INET; sa.sin_family = AF_INET;
sa.sin_addr.s_addr = ::inet_addr(master->bind_address.c_str()); 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, if (::bind(listen_socket,
(sockaddr*)&sa, (sockaddr*)&sa,
sizeof(sa)) < 0) { sizeof(sa)) < 0) {

4
a8/websocketsession.cc
View File

@ -228,11 +228,11 @@ namespace a8
framelen = payloadlen; framelen = payloadlen;
mask_offset = 2; mask_offset = 2;
} else if (payloadlen == 126 && ava_len >= 4) { } else if (payloadlen == 126 && ava_len >= 4) {
framelen = ::ntohs( *(u_short*) (real_buf + 2) ); framelen = ntohs( *(u_short*) (real_buf + 2) );
mask_offset = 4; mask_offset = 4;
} else if (payloadlen == 127 && ava_len >= 8) { } else if (payloadlen == 127 && ava_len >= 8) {
//int32 or int64? //int32 or int64?
framelen = ::ntohl( *(u_long*) (real_buf + 2) ); framelen = ntohl( *(u_long*) (real_buf + 2) );
mask_offset = 8; mask_offset = 8;
} else { } else {
return; return;