github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-01-11 23:52:54 +00:00
Code Issues Releases Wiki Activity

Leave addresses on pre-configured TAP devices alone.

Browse Source
This commit is contained in:
Olaf Seibert 2017-01-23 20:39:19 +01:00
parent 372c24de14
commit d677598f66
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/osdnet.c
View File

@ -1902,23 +1902,35 @@ osn_pfinit_tuntap(struct pfdata *pfdata, struct osnpf *osnpf, void *arg)
#else /* not CENV_SYS_LINUX */
{
/* Internal method */
struct ifaliasreq ifra;
struct ifreq ifr;
/* Delete first (only) IP address for this device, if any.
Ignore errors.
*/
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCDIFADDR, &ifr) < 0) {
if (DP_DBGFLG)
syserr(errno, "osn_pfinit_tuntap SIOCDIFADDR failed; usual for new interfaces.");
if (tt_ctx.my_tap || pfdata->pf_ip4_only) {
/*
* Delete first (only) IP address for this device, if any.
* Ignore errors.
* Don't do this on pre-existing taps, since they may have
* an address for routing, and we don't want to foil that.
*/
struct ifreq ifr;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ifnam, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCDIFADDR, &ifr) < 0) {
if (DP_DBGFLG)
syserr(errno, "osn_pfinit_tuntap SIOCDIFADDR failed; usual for new interfaces.");
}
/* Later perhaps set some address as configured by the user
* on the tap device... maybe from tunaddr=1.2.3.4 which is
* in iplocal. But that needs finding the broadcast address.
*/
}
if (pfdata->pf_ip4_only) {
/*
* Then set the point-to-point addresses for the tunnel.
*/
struct ifaliasreq ifra;
memset(&ifra, 0, sizeof(ifra));
strncpy(ifra.ifra_name, ifnam, sizeof(ifra.ifra_name));
((struct sockaddr_in *)(&ifra.ifra_addr))->sin_len = sizeof(struct sockaddr_in);