src/usr.bin/netstat/inet.c - diff

Return to inet.c CVS log

Up to [local] / src / usr.bin / netstat

Diff for /src/usr.bin/netstat/inet.c between version 1.22 and 1.23

version 1.22, 1997/11/09 16:33:09

version 1.23, 1998/02/27 12:07:33

Line 454

static int first;

static struct rpcnams *rpcn;

struct rpcnams *n;

char num[10];

char num[20];

if (first == 0) {

first = 1;

Line 490

if (rpc)

n->rpcname = strdup(rpc->r_name);

else {

sprintf(num, "%ld", head->pml_map.pm_prog);

snprintf(num, sizeof num, "%ld",

head->pml_map.pm_prog);

n->rpcname = strdup(num);

}

Line 519

Line 520

int proton;

int width;

sprintf(line, "%.*s.", (Aflag && !nflag) ? 12 : 16, inetname(in));

snprintf(line, sizeof line, "%.*s.", (Aflag && !nflag) ? 12 : 16,

inetname(in));

cp = strchr(line, '\0');

if (!nflag && port)

sp = getservbyport((int)port, proto);

if (sp || port == 0)

sprintf(cp, "%.8s", sp ? sp->s_name : "*");

snprintf(cp, line + sizeof line - cp, "%.8s",

sp ? sp->s_name : "*");

else if (local && !nflag && (nam = getrpcportnam(ntohs(port),

(strcmp(proto, "tcp") == 0 ? IPPROTO_TCP : IPPROTO_UDP))))

sprintf(cp, "%d[%.8s]", ntohs(port), nam);

snprintf(cp, line + sizeof line - cp, "%d[%.8s]",

ntohs(port), nam);

else

sprintf(cp, "%d", ntohs(port));

snprintf(cp, line + sizeof line - cp, "%d", ntohs(port));

width = Aflag ? 18 : 22;

printf(" %-*.*s", width, width, line);

}

Line 579

Line 583

}

if (inp->s_addr == INADDR_ANY)

strcpy(line, "*");

snprintf(line, sizeof line, "*");

else if (cp)

strcpy(line, cp);

snprintf(line, sizeof line, "%s", cp);

else {

inp->s_addr = ntohl(inp->s_addr);

#define C(x) ((x) & 0xff)

sprintf(line, "%u.%u.%u.%u", C(inp->s_addr >> 24),

snprintf(line, sizeof line, "%u.%u.%u.%u",

C(inp->s_addr >> 16), C(inp->s_addr >> 8), C(inp->s_addr));

C(inp->s_addr >> 24), C(inp->s_addr >> 16),

C(inp->s_addr >> 8), C(inp->s_addr));

}

return (line);

}