mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-06-07 04:53:44 +02:00
.
This commit is contained in:
parent
933404b1dd
commit
ef12c5af99
1 changed files with 16 additions and 10 deletions
|
@ -436,11 +436,14 @@ int main(int argc,char **argv)
|
||||||
socklen_t sl = sizeof(in6);
|
socklen_t sl = sizeof(in6);
|
||||||
const int pl = (int)recvfrom(s6,pkt.unsafeData(),pkt.capacity(),0,(struct sockaddr *)&in6,&sl);
|
const int pl = (int)recvfrom(s6,pkt.unsafeData(),pkt.capacity(),0,(struct sockaddr *)&in6,&sl);
|
||||||
if (pl > 0) {
|
if (pl > 0) {
|
||||||
try {
|
if (pl >= ZT_PROTO_MIN_FRAGMENT_LENGTH) {
|
||||||
pkt.setSize((unsigned int)pl);
|
try {
|
||||||
handlePacket(s6,reinterpret_cast<const InetAddress *>(&in6),pkt);
|
pkt.setSize((unsigned int)pl);
|
||||||
} catch ( ... ) {
|
handlePacket(s6,reinterpret_cast<const InetAddress *>(&in6),pkt);
|
||||||
printf("* unexpected exception" ZT_EOL_S);
|
} catch ( ... ) {
|
||||||
|
char ipstr[128];
|
||||||
|
printf("* unexpected exception handling packet from %s" ZT_EOL_S,reinterpret_cast<const InetAddress *>(&in6)->toString(ipstr));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
|
@ -456,11 +459,14 @@ int main(int argc,char **argv)
|
||||||
socklen_t sl = sizeof(in4);
|
socklen_t sl = sizeof(in4);
|
||||||
const int pl = (int)recvfrom(s4,pkt.unsafeData(),pkt.capacity(),0,(struct sockaddr *)&in4,&sl);
|
const int pl = (int)recvfrom(s4,pkt.unsafeData(),pkt.capacity(),0,(struct sockaddr *)&in4,&sl);
|
||||||
if (pl > 0) {
|
if (pl > 0) {
|
||||||
try {
|
if (pl >= ZT_PROTO_MIN_FRAGMENT_LENGTH) {
|
||||||
pkt.setSize((unsigned int)pl);
|
try {
|
||||||
handlePacket(s4,reinterpret_cast<const InetAddress *>(&in4),pkt);
|
pkt.setSize((unsigned int)pl);
|
||||||
} catch ( ... ) {
|
handlePacket(s4,reinterpret_cast<const InetAddress *>(&in4),pkt);
|
||||||
printf("* unexpected exception" ZT_EOL_S);
|
} catch ( ... ) {
|
||||||
|
char ipstr[128];
|
||||||
|
printf("* unexpected exception handling packet from %s" ZT_EOL_S,reinterpret_cast<const InetAddress *>(&in4)->toString(ipstr));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue