github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-11-04 12:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed get_sock_error() format on windows

Browse Source
This commit is contained in:
U-DESKTOP-T772REH\wangyu
2018-11-13 20:29:37 +08:00
parent 7544fbe9d7
commit 07ad00f54d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client.cpp
View File

@@ -185,7 +185,8 @@ int client_on_timer(conn_info_t &conn_info) //for client. called when a timer is
{
setnonblocking(bind_fd);
int ret=connect(bind_fd,(struct sockaddr *)&remote_addr.inner,remote_addr.get_len());
mylog(log_info,"ret=%d,errno=%s,%d %s\n",ret,get_sock_error(),bind_fd,remote_addr.get_str());
mylog(log_debug,"ret=%d,errno=%s, %d %s\n",ret,get_sock_error(),bind_fd,remote_addr.get_str());
//mylog(log_info,"ret=%d,errno=,%d %s\n",ret,bind_fd,remote_addr.get_str());
conn_info.state.client_current_state=client_tcp_handshake_dummy;
mylog(log_info,"state changed from client_idle to client_tcp_handshake_dummy\n");
}

6
common.cpp
View File

@@ -452,7 +452,11 @@ char *get_sock_error()
(LPWSTR)&s, 0, NULL);
sprintf(buf, "%d:%S", e,s);
int len=strlen(buf);
if(len>0&&buf[len-1]=='\n') buf[len-1]=0;
while(len>0 && (buf[len-1]=='\r'||buf[len-1]=='\n' ))
{
len--;
buf[len]=0;
}
LocalFree(s);
return buf;
}