ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-04-11 13:09:55 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

getsockopt() tweak

Browse Source
This commit is contained in:
Joseph Henry 2015-12-18 11:37:11 -08:00
parent c22c0a20f6
commit fde8af9483
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netcon/Intercept.c
View File

@ -159,6 +159,7 @@ static int get_retval()
if(n_read > 0) {
memcpy(&retval, &retbuf[1], sizeof(retval));
memcpy(&errno, &retbuf[1+sizeof(retval)], sizeof(errno));
dwr(MSG_DEBUG, "get_retval(): ret = %d\n", retval);
return retval;
}
}
@ -403,23 +404,28 @@ int getsockopt(GETSOCKOPT_SIG)
return -1;
}
dwr(MSG_DEBUG,"getsockopt(%d)\n", sockfd);
/*
if(is_mapped_to_service(sockfd) < 0) { // First, check if the service manages this
if(is_mapped_to_service(sockfd) <= 0) { // First, check if the service manages this
return realgetsockopt(sockfd, level, optname, optval, optlen);
}
*/
int err = realgetsockopt(sockfd, level, optname, optval, optlen);
//return 0;
//int err = realgetsockopt(sockfd, level, optname, optval, optlen);
/* TODO: this condition will need a little more intelligence later on
-- we will need to know if this fd is a local we are spoofing, or a true local */
if(optname == SO_TYPE)
{
int* val = (int*)optval;
*val = 2;
optval = (void*)val;
}
/*
if(err < 0){
perror("setsockopt():\n");
perror("getsockopt():\n");
}
*/
return 0;
}

2
netcon/NetconEthernetTap.cpp
View File

@ -440,6 +440,8 @@ void NetconEthernetTap::die(int exret) {
*/
void NetconEthernetTap::closeConnection(TcpConnection *conn)
{
//return;
//dwr(MSG_DEBUG, "closeConnection(): conn = 0x%x\n", conn);
if(!conn)
return;
dwr(MSG_DEBUG, " closeConnection(%x, %d)\n", conn->pcb, _phy.getDescriptor(conn->dataSock));