d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem in printing interface names.

Browse Source
This commit is contained in:
Luigi Rizzo 1999-08-12 05:40:07 +00:00
parent e2bd328224
commit a18ff8bea7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
release/picobsd/tinyware/ns/ns.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ns.c,v 1.4 1998/09/07 06:41:14 abial Exp $
* $Id: ns.c,v 1.5 1998/10/09 12:42:20 abial Exp $
*/
@ -135,11 +135,15 @@ sock_ntop(const struct sockaddr *sa, size_t salen)
}
case AF_LINK: {
struct sockaddr_dl *sdl = (struct sockaddr_dl *) sa;
int l = sdl->sdl_nlen ;
if (sdl->sdl_nlen > 0)
snprintf(str, sizeof(str), "%*s",
sdl->sdl_nlen, &sdl->sdl_data[0]);
else
if (l >= sizeof(str) )
l = sizeof(str) - 1 ;
if (l > 0) {
strncpy(str, &sdl->sdl_data[0], l);
str[l] = '\0';
} else
snprintf(str, sizeof(str), "link#%d", sdl->sdl_index);
return(str);
}
@ -303,16 +307,15 @@ print_routing(char *proto)
printf("----------------\n");
printf("Name Mtu Network Address "
"Ipkts Ierrs Opkts Oerrs Coll\n");
}
i=0;
for(next=if_buf;next<lim;next+=ifm->ifm_msglen) {
i=0;
for(next=if_buf;next<lim;next+=ifm->ifm_msglen) {
ifm=(struct if_msghdr *)next;
if_table[i]=(struct sockaddr *)(ifm+1);
ifm_table[i]=ifm;
sa = if_table[i];
if (iflag && sa->sa_family == AF_LINK) {
if (sa->sa_family == AF_LINK) {
struct sockaddr_dl *sdl = (struct sockaddr_dl *) sa;
printf("%-4s %-5d <Link> ",
@ -333,6 +336,7 @@ print_routing(char *proto)
);
}
i++;
}
}
if (!rflag) {
free(rt_buf);