Skip to content
Browse files

Crash bug in IpTunnel

  • Loading branch information...
1 parent 000223f commit 53df63c4850aed49f56dec3d819ff1a12a3de9ea Caleb James DeLisle committed Dec 5, 2012
Showing with 4 additions and 4 deletions.
  1. +2 −2 admin/angel/cjdroute2.c
  2. +2 −2 tunnel/IpTunnel.c
View
4 admin/angel/cjdroute2.c
@@ -264,15 +264,15 @@ static int genconf(struct Random* rand)
" \"allowedConnections\":\n"
" [\n"
" // {\n"
- " // \"pubKey\": "
+ " // \"publicKey\": "
"\"f64hfl7c4uxt6krmhPutTheRealAddressOfANodeHere7kfm5m0.k\",\n"
" // \"ip4Address\": \"192.168.1.24\",\n"
" // \"ip6Address\": \"2001:123:ab::10\"\n"
" // },\n"
"\n"
" // It's ok to only specify one address.\n"
" // {\n"
- " // \"pubKey\": "
+ " // \"publicKey\": "
"\"ydq8csdk8p8ThisIsJustAnExampleAddresstxuyqdf27hvn2z0.k\",\n"
" // \"ip4Address\": \"192.168.1.24\",\n"
" // \"ip6Address\": \"2001:123:ab::10\"\n"
View
4 tunnel/IpTunnel.c
@@ -547,7 +547,7 @@ static uint8_t ip6FromNode(struct Message* message,
}
struct Interface* tunIf = &context->pub.tunInterface;
if (tunIf->receiveMessage) {
- tunIf->receiveMessage(message, tunIf->receiverContext);
+ tunIf->receiveMessage(message, tunIf);
}
return 0;
}
@@ -567,7 +567,7 @@ static uint8_t ip4FromNode(struct Message* message,
}
struct Interface* tunIf = &context->pub.tunInterface;
if (tunIf->receiveMessage) {
- return tunIf->receiveMessage(message, tunIf->receiverContext);
+ return tunIf->receiveMessage(message, tunIf);
}
return 0;
}

0 comments on commit 53df63c

Please sign in to comment.
Something went wrong with that request. Please try again.