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

MFC: netstat.h 1.53; route.c 1.86, 1.87

Browse Source 
Fix netname() (though for RELENG_6 more or less cosmetic only) and
routename() on big-endian LP64 archs.
This commit is contained in:
marius 2008-02-14 21:52:38 +00:00
parent cded3a52a8
commit 6dc790e802
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/netstat/netstat.h
View File

@ -124,8 +124,8 @@ char *ipx_phost(struct sockaddr *);
char *ns_phost(struct sockaddr *); char *ns_phost(struct sockaddr *);
void upHex(char *); void upHex(char *);
char *routename(u_long); char *routename(in_addr_t);
char *netname(u_long, u_long); char *netname(in_addr_t, u_long);
char *atalk_print(struct sockaddr *, int); char *atalk_print(struct sockaddr *, int);
char *atalk_print2(struct sockaddr *, struct sockaddr *, int); char *atalk_print2(struct sockaddr *, struct sockaddr *, int);
char *ipx_print(struct sockaddr *); char *ipx_print(struct sockaddr *);

23
usr.bin/netstat/route.c
View File

@ -134,7 +134,7 @@ static void p_flags (int, const char *);
static const char *fmt_flags(int f); static const char *fmt_flags(int f);
static void p_rtentry (struct rtentry *); static void p_rtentry (struct rtentry *);
static u_long forgemask (u_long); static u_long forgemask (u_long);
static void domask (char *, u_long, u_long); static void domask (char *, in_addr_t, u_long);
/* /*
* Print routing tables. * Print routing tables.
@ -765,7 +765,7 @@ p_rtentry(struct rtentry *rt)
} }
char * char *
routename(u_long in) routename(in_addr_t in)
{ {
char *cp; char *cp;
static char line[MAXHOSTNAMELEN]; static char line[MAXHOSTNAMELEN];
@ -773,8 +773,7 @@ routename(u_long in)
cp = 0; cp = 0;
if (!numeric_addr) { if (!numeric_addr) {
hp = gethostbyaddr((char *)&in, sizeof (struct in_addr), hp = gethostbyaddr(&in, sizeof (struct in_addr), AF_INET);
AF_INET);
if (hp) { if (hp) {
cp = hp->h_name; cp = hp->h_name;
trimdomain(cp, strlen(cp)); trimdomain(cp, strlen(cp));
@ -786,7 +785,7 @@ routename(u_long in)
} else { } else {
#define C(x) ((x) & 0xff) #define C(x) ((x) & 0xff)
in = ntohl(in); in = ntohl(in);
sprintf(line, "%lu.%lu.%lu.%lu", sprintf(line, "%u.%u.%u.%u",
C(in >> 24), C(in >> 16), C(in >> 8), C(in)); C(in >> 24), C(in >> 16), C(in >> 8), C(in));
} }
return (line); return (line);
@ -807,7 +806,7 @@ forgemask(u_long a)
} }
static void static void
domask(char *dst, u_long addr, u_long mask) domask(char *dst, in_addr_t addr, u_long mask)
{ {
int b, i; int b, i;
@ -839,13 +838,13 @@ domask(char *dst, u_long addr, u_long mask)
* The address is assumed to be that of a net or subnet, not a host. * The address is assumed to be that of a net or subnet, not a host.
*/ */
char * char *
netname(u_long in, u_long mask) netname(in_addr_t in, u_long mask)
{ {
char *cp = 0; char *cp = 0;
static char line[MAXHOSTNAMELEN]; static char line[MAXHOSTNAMELEN];
struct netent *np = 0; struct netent *np = 0;
u_long dmask; u_long dmask;
u_long i; in_addr_t i;
#define NSHIFT(m) ( \ #define NSHIFT(m) ( \
(m) == IN_CLASSA_NET ? IN_CLASSA_NSHIFT : \ (m) == IN_CLASSA_NET ? IN_CLASSA_NSHIFT : \
@ -872,26 +871,26 @@ netname(u_long in, u_long mask)
switch (dmask) { switch (dmask) {
case IN_CLASSA_NET: case IN_CLASSA_NET:
if ((i & IN_CLASSA_HOST) == 0) { if ((i & IN_CLASSA_HOST) == 0) {
sprintf(line, "%lu", C(i >> 24)); sprintf(line, "%u", C(i >> 24));
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case IN_CLASSB_NET: case IN_CLASSB_NET:
if ((i & IN_CLASSB_HOST) == 0) { if ((i & IN_CLASSB_HOST) == 0) {
sprintf(line, "%lu.%lu", sprintf(line, "%u.%u",
C(i >> 24), C(i >> 16)); C(i >> 24), C(i >> 16));
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case IN_CLASSC_NET: case IN_CLASSC_NET:
if ((i & IN_CLASSC_HOST) == 0) { if ((i & IN_CLASSC_HOST) == 0) {
sprintf(line, "%lu.%lu.%lu", sprintf(line, "%u.%u.%u",
C(i >> 24), C(i >> 16), C(i >> 8)); C(i >> 24), C(i >> 16), C(i >> 8));
break; break;
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
sprintf(line, "%lu.%lu.%lu.%lu", sprintf(line, "%u.%u.%u.%u",
C(i >> 24), C(i >> 16), C(i >> 8), C(i)); C(i >> 24), C(i >> 16), C(i >> 8), C(i));
break; break;
} }