1 --- net-tools-1.60/netstat.c.num-ports 2004-11-24 12:19:24.000000000 +0100
2 +++ net-tools-1.60/netstat.c 2004-11-25 16:00:45.208367104 +0100
6 safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr,
7 - flag_not), sizeof(local_addr));
8 - safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag_not),
9 + flag_not & FLAG_NUM_HOST), sizeof(local_addr));
10 + safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr, flag_not & FLAG_NUM_HOST),
12 if (flag_all || (flag_lst && !rem_port) || (!flag_lst && rem_port)) {
13 snprintf(buffer, sizeof(buffer), "%s",
15 if (flag_all || (notnull(remaddr) && !flag_lst) || (!notnull(remaddr) && flag_lst))
17 safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr,
18 - flag_not), sizeof(local_addr));
19 + flag_not & FLAG_NUM_HOST), sizeof(local_addr));
20 snprintf(buffer, sizeof(buffer), "%s",
21 get_sname(htons(local_port), "udp",
22 flag_not & FLAG_NUM_PORT));
23 - if ((strlen(local_addr) + strlen(buffer)) > 22)
24 + if ((strlen(local_addr) + strlen(buffer)) >= 27)
25 local_addr[22 - strlen(buffer)] = '\0';
26 strcat(local_addr, ":");
27 strncat(local_addr, buffer, sizeof(local_addr)-strlen(local_addr)-1);
29 snprintf(buffer, sizeof(buffer), "%s",
30 get_sname(htons(rem_port), "udp", flag_not & FLAG_NUM_PORT));
31 safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,
32 - flag_not), sizeof(rem_addr));
33 - if ((strlen(rem_addr) + strlen(buffer)) > 22)
34 + flag_not & FLAG_NUM_HOST), sizeof(rem_addr));
35 + if ((strlen(rem_addr) + strlen(buffer)) >= 27)
36 rem_addr[22 - strlen(buffer)] = '\0';
37 strcat(rem_addr, ":");
38 strncat(rem_addr, buffer, sizeof(rem_addr)-strlen(rem_addr)-1);
43 - printf("udp %6ld %6ld %-23s %-23s %-12s",
44 + printf("udp %6ld %6ld %-27s %-27s %-12s",
45 rxq, txq, local_addr, rem_addr, udp_state);
47 finish_this_one(uid,inode,timers);
49 get_sname(htons(local_port), "raw",
50 flag_not & FLAG_NUM_PORT));
51 safe_strncpy(local_addr, ap->sprint((struct sockaddr *) &localaddr,
52 - flag_not), sizeof(local_addr));
53 - if ((strlen(local_addr) + strlen(buffer)) > 22)
54 + flag_not & FLAG_NUM_HOST), sizeof(local_addr));
55 + if ((strlen(local_addr) + strlen(buffer)) >= 27)
56 local_addr[22 - strlen(buffer)] = '\0';
57 strcat(local_addr, ":");
58 strncat(local_addr, buffer, sizeof(local_addr)-strlen(local_addr)-1);
60 snprintf(buffer, sizeof(buffer), "%s",
61 get_sname(htons(rem_port), "raw", flag_not & FLAG_NUM_PORT));
62 safe_strncpy(rem_addr, ap->sprint((struct sockaddr *) &remaddr,
63 - flag_not), sizeof(rem_addr));
64 - if ((strlen(rem_addr) + strlen(buffer)) > 22)
65 + flag_not & FLAG_NUM_HOST), sizeof(rem_addr));
66 + if ((strlen(rem_addr) + strlen(buffer)) >= 27)
67 rem_addr[22 - strlen(buffer)] = '\0';
68 strcat(rem_addr, ":");
69 strncat(rem_addr, buffer, sizeof(rem_addr)-strlen(rem_addr)-1);
74 - printf("raw %6ld %6ld %-23s %-23s %-12d",
75 + printf("raw %6ld %6ld %-27s %-27s %-12d",
76 rxq, txq, local_addr, rem_addr, state);
78 finish_this_one(uid,inode,timers);