retronetworking
/
isdn4k-utils
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't think EEXIST when adding a route is a fatal error.

This commit is contained in:
Paul Slootman 1999-08-03 14:17:34 +00:00
parent 6feba7ac65
commit c22fb3aec1
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ipppd/sys-linux.c
View File

@ -647,11 +647,23 @@ int sifaddr (int unit, int our_adr, int his_adr, int net_mask)
rt.rt_flags |= RTF_HOST;
if (ioctl(sockfd, SIOCADDRT, &rt) < 0) {
syslog (LOG_ERR, "ioctl(SIOCADDRT) device route (%s/%s/%08x): %m",
int severity;
/*
* It's not fatal IMHO if the route already exists!
* Give a notice, though...
*/
if (errno == EEXIST) {
severity = LOG_NOTICE;
}
else {
severity = LOG_ERR:
}
syslog (severity, "ioctl(SIOCADDRT) device route (%s/%s/%08x): %m",
rt.rt_dev,
inet_ntoa(((struct sockaddr_in *)&rt.rt_dst)->sin_addr),
ntohl(net_mask));
return (0);
if (severity == LOG_ERR)
return 0;
}
}
@ -891,8 +903,20 @@ int sifdefaultroute (int unit, int gateway)
rt.rt_flags = RTF_UP | RTF_GATEWAY;
if (ioctl(sockfd, SIOCADDRT, &rt) < 0) {
syslog (LOG_ERR, "default route ioctl(SIOCADDRT): %m");
return 0;
int severity;
/*
* It's not fatal IMHO if the route already exists!
* Give a notice, though...
*/
if (errno == EEXIST) {
severity = LOG_NOTICE;
}
else {
severity = LOG_ERR:
}
syslog (severity, "default route ioctl(SIOCADDRT): %m");
if (severity == LOG_ERR)
return 0;
}
}
has_default_route = 1;