enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

fixed metric parameter passing to wintap.c (#618)

Browse Source 
* fixed metric parameter passing to wintap.c

* fixed metric sub/interface command to set metric
This commit is contained in:
Logan oos Even 2021-02-01 16:19:19 +05:45 committed by GitHub
parent c2741ace2d
commit 916c423ffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/edge.c
View File

@ -1032,12 +1032,13 @@ int main (int argc, char* argv[]) {
}
if(runlevel == 4) { /* configure the TUNTAP device */
#ifdef WIN32
tuntap.metric = eee->tuntap_priv_conf.metric;
#endif
if(tuntap_open(&tuntap, eee->tuntap_priv_conf.tuntap_dev_name, eee->tuntap_priv_conf.ip_mode,
eee->tuntap_priv_conf.ip_addr, eee->tuntap_priv_conf.netmask,
eee->tuntap_priv_conf.device_mac, eee->tuntap_priv_conf.mtu) < 0)
eee->tuntap_priv_conf.device_mac, eee->tuntap_priv_conf.mtu
#ifdef WIN32
, eee->tuntap_priv_conf.metric
#endif
) < 0)
exit(1);
memcpy(&eee->device, &tuntap, sizeof(tuntap));
traceEvent(TRACE_NORMAL, "Created local tap device IP: %s, Mask: %s, MAC: %s",

40
win32/wintap.c
View File

@ -228,7 +228,9 @@ int open_wintap(struct tuntap_dev *device,
char *device_ip,
char *device_mask,
const char *device_mac,
int mtu) {
int mtu,
int metric) {
char cmd[256];
DWORD len;
ULONG status = TRUE;
@ -299,14 +301,33 @@ int open_wintap(struct tuntap_dev *device,
/* ****************** */
/* MTU and network metric */
/* MTU */
_snprintf(cmd, sizeof(cmd),
"netsh interface ipv4 set subinterface \"%s\" mtu=%d metric=%d store=persistent > nul",
device->ifName, mtu, device->metric);
"netsh interface ipv4 set subinterface \"%s\" mtu=%d store=persistent > nul",
device->ifName, mtu);
if(system(cmd) != 0)
printf("WARNING: Unable to set device %s parameters MTU=%d metric=%d store=persistent [%s]\n",
device->ifName, mtu, device->metric, cmd);
printf("WARNING: Unable to set device %s parameters MTU=%d store=persistent [%s]\n",
device->ifName, mtu, cmd);
/* ****************** */
/* metric */
device->metric = metric;
_snprintf(cmd, sizeof(cmd),
"netsh interface ipv4 set interface \"%s\" metric=%d > nul",
device->ifName, device->metric);
if(system(cmd) != 0)
printf("WARNING: Unable to set device %s parameters metric=%d [%s]\n",
device->ifName, device->metric, cmd);
/* ****************** */
/* set driver media status to 'connected' (i.e. set the interface up) */
if (!DeviceIoControl (device->device_handle, TAP_IOCTL_SET_MEDIA_STATUS,
@ -389,8 +410,9 @@ int tuntap_open(struct tuntap_dev *device,
char *device_ip,
char *device_mask,
const char * device_mac,
int mtu) {
return(open_wintap(device, dev, address_mode, device_ip, device_mask, device_mac, mtu));
int mtu,
int metric) {
return(open_wintap(device, dev, address_mode, device_ip, device_mask, device_mac, mtu, metric));
}
/* ************************************************ */
@ -415,7 +437,7 @@ int main(int argc, char* argv[]) {
printf("Welcome to n2n\n");
initWin32();
open_wintap(&tuntap, "static", "1.2.3.20", "255.255.255.0", mtu);
open_wintap(&tuntap, "static", "1.2.3.20", "255.255.255.0", mtu, 0);
for(i=0; i<10; i++) {
u_char buf[MTU];