Browse Source
Merge pull request #347 from skyformat99/fix_win
On Windows, the Edge node exits when the network card is disabled and…
pull/351/head
Luca Deri
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
src/edge.c
-
win32/wintap.c
|
@ -887,9 +887,9 @@ int main(int argc, char* argv[]) { |
|
|
traceEvent(TRACE_WARNING, "Community and encryption key must differ, otherwise security will be compromised"); |
|
|
traceEvent(TRACE_WARNING, "Community and encryption key must differ, otherwise security will be compromised"); |
|
|
|
|
|
|
|
|
if(tuntap_open(&tuntap, ec.tuntap_dev_name, ec.ip_mode, ec.ip_addr, ec.netmask, ec.device_mac, ec.mtu) < 0) |
|
|
if(tuntap_open(&tuntap, ec.tuntap_dev_name, ec.ip_mode, ec.ip_addr, ec.netmask, ec.device_mac, ec.mtu) < 0) |
|
|
return(-1); |
|
|
exit(1); |
|
|
|
|
|
|
|
|
if((eee = edge_init(&tuntap, &conf, &rc)) == NULL) { |
|
|
if((eee = edge_init(&tuntap, &conf, &rc)) == NULL) { |
|
|
traceEvent(TRACE_ERROR, "Failed in edge_init"); |
|
|
traceEvent(TRACE_ERROR, "Failed in edge_init"); |
|
|
exit(1); |
|
|
exit(1); |
|
|
} |
|
|
} |
|
|
|
@ -241,7 +241,7 @@ int open_wintap(struct tuntap_dev *device, |
|
|
printf("No Windows tap devices found, did you run tapinstall.exe?\n"); |
|
|
printf("No Windows tap devices found, did you run tapinstall.exe?\n"); |
|
|
else |
|
|
else |
|
|
printf("Cannot find tap device \"%s\"\n", devname); |
|
|
printf("Cannot find tap device \"%s\"\n", devname); |
|
|
exit(EXIT_FAILURE); |
|
|
return -1; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/* ************************************** */ |
|
|
/* ************************************** */ |
|
|