|
 |
b38ebe5 |
diff --git a/netstat.c b/netstat.c
|
|
|
b38ebe5 |
index c084dfb..cfcfb78 100644
|
|
|
b38ebe5 |
--- a/netstat.c
|
|
|
b38ebe5 |
+++ b/netstat.c
|
|
|
b38ebe5 |
@@ -743,6 +743,7 @@ static void igmp_do_one(int lnr, const char *line,const char *prot)
|
|
|
b38ebe5 |
static int igmp6_flag = 0;
|
|
|
b38ebe5 |
static char device[16];
|
|
|
b38ebe5 |
int num, idx, refcnt;
|
|
|
b38ebe5 |
+ char* offset;
|
|
|
b38ebe5 |
|
|
|
b38ebe5 |
if (lnr == 0) {
|
|
|
b38ebe5 |
/* IPV6 ONLY */
|
|
|
b38ebe5 |
@@ -794,17 +795,21 @@ static void igmp_do_one(int lnr, const char *line,const char *prot)
|
|
|
b38ebe5 |
#if HAVE_AFINET
|
|
|
b38ebe5 |
if (line[0] != '\t') {
|
|
|
b38ebe5 |
if (idx_flag) {
|
|
|
b38ebe5 |
- if ((num = sscanf( line, "%d\t%10c", &idx, device)) < 2) {
|
|
|
b38ebe5 |
+ if ((num = sscanf( line, "%d\t%15c", &idx, device)) < 2) {
|
|
|
b38ebe5 |
fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr);
|
|
|
b38ebe5 |
return;
|
|
|
b38ebe5 |
}
|
|
|
b38ebe5 |
} else {
|
|
|
b38ebe5 |
- if ( (num = sscanf( line, "%10c", device )) < 1 ) {
|
|
|
b38ebe5 |
+ if ( (num = sscanf( line, "%15c", device )) < 1 ) {
|
|
|
b38ebe5 |
fprintf(stderr, _("warning, got bogus igmp line %d.\n"), lnr);
|
|
|
b38ebe5 |
return;
|
|
|
b38ebe5 |
}
|
|
|
b38ebe5 |
}
|
|
|
b38ebe5 |
- device[10] = '\0';
|
|
|
b38ebe5 |
+
|
|
|
b38ebe5 |
+ offset = strrchr(device, ':');
|
|
|
b38ebe5 |
+ if(offset)
|
|
|
b38ebe5 |
+ *offset = 0;
|
|
|
b38ebe5 |
+
|
|
|
b38ebe5 |
return;
|
|
|
b38ebe5 |
} else if ( line[0] == '\t' ) {
|
|
|
b38ebe5 |
if ( (num = sscanf(line, "\t%8[0-9A-Fa-f] %d", mcast_addr, &refcnt)) < 2 ) {
|
|
|
b38ebe5 |
@@ -2037,7 +2037,7 @@ static int iface_info(void)
|
|
|
b38ebe5 |
if (flag_exp < 2) {
|
|
|
b38ebe5 |
ife_short = 1;
|
|
|
b38ebe5 |
if(!(count % 8))
|
|
|
b38ebe5 |
- printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
|
|
b38ebe5 |
+ printf(_("Iface MTU RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg\n"));
|
|
|
b38ebe5 |
}
|
|
|
b38ebe5 |
|
|
|
b38ebe5 |
if (flag_int_name) {
|
|
|
b38ebe5 |
diff --git a/lib/interface.c b/lib/interface.c
|
|
|
b38ebe5 |
index 3bd999f..97f3db5 100644
|
|
|
b38ebe5 |
--- a/lib/interface.c
|
|
|
b38ebe5 |
+++ b/lib/interface.c
|
|
|
b38ebe5 |
@@ -655,7 +655,7 @@ int do_if_print(struct interface *ife, void *cookie)
|
|
|
b38ebe5 |
|
|
|
b38ebe5 |
void ife_print_short(struct interface *ptr)
|
|
|
b38ebe5 |
{
|
|
|
b38ebe5 |
- printf("%-8.8s ", ptr->name);
|
|
|
b38ebe5 |
+ printf("%-15.15s ", ptr->name);
|
|
|
b38ebe5 |
printf("%5d ", ptr->mtu);
|
|
|
b38ebe5 |
/* If needed, display the interface statistics. */
|
|
|
b38ebe5 |
if (ptr->statistics_valid) {
|