github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-04-09 14:33:46 +00:00
Code Issues Releases Wiki Activity

Merge pull request #61 from PDP-10/imp-ifmeth-default

Browse Source 
IMP: Use reasonable interface methods
This commit is contained in:
Rhialto The M
2021-08-07 14:26:56 +02:00
committed by GitHub
parent eb33d416d3 a70af64860
commit b5601a46c7
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/dvlhdh.c
View File

@@ -401,6 +401,27 @@ lhdh_conf(FILE *f, char *s, struct lhdh *lh)
return FALSE;
}
// Default the interface method based on arguments given
if (lh->lh_ifmeth == NULL) {
if (lh->lh_tunadr[0] != '\0') {
fprintf(f, "IMP assuming \"tun\" interface method since \"tunaddr\" parameter given\n");
lh->lh_ifmeth = s_dup("tun");
}
else if (lh->lh_gwadr[0] != '\0') {
fprintf(f, "IMP assuming \"pcap\" interface method since \"gwaddr\" parameter given\n");
lh->lh_ifmeth = s_dup("pcap");
}
}
// The check for consistency
if ((lh->lh_gwadr[0] != '\0') && strcmp(lh->lh_ifmeth,"pcap") != 0) {
fprintf(f, "%%%% IMP: \"gwaddr\" parameter is only used with \"pcap\" interface method\n");
return FALSE;
}
else if ((lh->lh_tunadr[0] != '\0') && strcmp(lh->lh_ifmeth,"pcap") == 0) {
fprintf(f, "%%%% IMP: \"tunaddr\" parameter is not used with \"pcap\" interface method\n");
return FALSE;
}
return ret;
}
@@ -1074,7 +1095,7 @@ imp_init(register struct lhdh *lh, FILE *of)
if (lh->lh_ifmeth) /* Pass on interface method if any */
strncpy(dpc->dpimp_ifmeth, lh->lh_ifmeth, sizeof(dpc->dpimp_ifmeth)-1);
else
dpc->dpimp_ifnam[0] = '\0'; /* No specific interface */
dpc->dpimp_ifmeth[0] = '\0'; /* No specific method */
memcpy((char *)dpc->dpimp_ip, /* Set our IP address for filter */
lh->lh_ipadr, 4);
memcpy((char *)dpc->dpimp_gw, /* Set our GW address for IMP */