- Exit 1 if "add", "change", or "delete" operation fails.
PR: bin/12489 - Use inet_ntoa(3) where it should have been used. This part of code simply wasn't converted to the "new" style after the routename() function was converted from the protocol-generic version to protocol-specific version in CSRG revision 5.6. MFC after: 1 week
This commit is contained in:
parent
3f844a2221
commit
334b4431fa
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=77873
@ -363,6 +363,10 @@ An add operation was attempted, but the system was
|
|||||||
low on resources and was unable to allocate memory
|
low on resources and was unable to allocate memory
|
||||||
to create the new entry.
|
to create the new entry.
|
||||||
.El
|
.El
|
||||||
|
.Pp
|
||||||
|
The
|
||||||
|
.Nm
|
||||||
|
utility exits 0 on success or >0 if an error occurred.
|
||||||
.Sh SEE ALSO
|
.Sh SEE ALSO
|
||||||
.Xr netintro 4 ,
|
.Xr netintro 4 ,
|
||||||
.Xr route 4 ,
|
.Xr route 4 ,
|
||||||
|
@ -195,7 +195,6 @@ main(argc, argv)
|
|||||||
case K_ADD:
|
case K_ADD:
|
||||||
case K_DELETE:
|
case K_DELETE:
|
||||||
newroute(argc, argv);
|
newroute(argc, argv);
|
||||||
exit(0);
|
|
||||||
/* NOTREACHED */
|
/* NOTREACHED */
|
||||||
|
|
||||||
case K_MONITOR:
|
case K_MONITOR:
|
||||||
@ -358,13 +357,8 @@ routename(sa)
|
|||||||
if (cp) {
|
if (cp) {
|
||||||
strncpy(line, cp, sizeof(line) - 1);
|
strncpy(line, cp, sizeof(line) - 1);
|
||||||
line[sizeof(line) - 1] = '\0';
|
line[sizeof(line) - 1] = '\0';
|
||||||
} else {
|
} else
|
||||||
/* XXX - why not inet_ntoa()? */
|
(void) sprintf(line, "%s", inet_ntoa(in));
|
||||||
#define C(x) (unsigned)((x) & 0xff)
|
|
||||||
in.s_addr = ntohl(in.s_addr);
|
|
||||||
(void) sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
|
|
||||||
C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -454,6 +448,7 @@ netname(sa)
|
|||||||
if (np)
|
if (np)
|
||||||
cp = np->n_name;
|
cp = np->n_name;
|
||||||
}
|
}
|
||||||
|
#define C(x) (unsigned)((x) & 0xff)
|
||||||
if (cp)
|
if (cp)
|
||||||
strncpy(line, cp, sizeof(line));
|
strncpy(line, cp, sizeof(line));
|
||||||
else if ((in.s_addr & 0xffffff) == 0)
|
else if ((in.s_addr & 0xffffff) == 0)
|
||||||
@ -468,6 +463,7 @@ netname(sa)
|
|||||||
(void) sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
|
(void) sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
|
||||||
C(in.s_addr >> 16), C(in.s_addr >> 8),
|
C(in.s_addr >> 16), C(in.s_addr >> 8),
|
||||||
C(in.s_addr));
|
C(in.s_addr));
|
||||||
|
#undef C
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -731,9 +727,10 @@ newroute(argc, argv)
|
|||||||
(void) printf(" (%s)",
|
(void) printf(" (%s)",
|
||||||
inet_ntoa(((struct sockaddr_in *)&route.rt_gateway)->sin_addr));
|
inet_ntoa(((struct sockaddr_in *)&route.rt_gateway)->sin_addr));
|
||||||
}
|
}
|
||||||
if (ret == 0)
|
if (ret == 0) {
|
||||||
(void) printf("\n");
|
(void) printf("\n");
|
||||||
else {
|
exit(0);
|
||||||
|
} else {
|
||||||
switch (oerrno) {
|
switch (oerrno) {
|
||||||
case ESRCH:
|
case ESRCH:
|
||||||
err = "not in table";
|
err = "not in table";
|
||||||
@ -749,6 +746,7 @@ newroute(argc, argv)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
(void) printf(": %s\n", err);
|
(void) printf(": %s\n", err);
|
||||||
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user