Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Jun 2009 18:22:19 GMT
From:      Gabor Pali <pgj@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 164816 for review
Message-ID:  <200906211822.n5LIMJU1045073@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164816

Change 164816 by pgj@petymeg-current on 2009/06/21 18:21:22

	Improve resolve_portname()

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#32 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#32 (text+ko) ====

@@ -826,12 +826,16 @@
 {
 	struct servent *sp = NULL;
 
-	sp = getservbyport((int)htons(addr->at_port),
-	    addr->at_parent->st_name);
-	if ((sp != NULL || addr->at_port == 0) &&
-	    ((addr->at_flags & ADDRTYPE_ANONPORT) == 0))
-		sprintf(addr->at_portname, "%.15s", sp ? sp->s_name : "*");
-	else
-		sprintf(addr->at_portname, "%d", addr->at_port);
+	if ((addr->at_port == 0) ||
+	    ((addr->at_flags & ADDRTYPE_ANONPORT) != 0)) {
+		sprintf(addr->at_portname, "%.15s", "*");
+	} else {
+		sp = getservbyport((int)htons(addr->at_port),
+		    addr->at_parent->st_name);
+		if (sp != NULL)
+			sprintf(addr->at_portname, "%.15s", sp->s_name);
+		else
+			sprintf(addr->at_portname, "%d", addr->at_port);
+	}
 	addr->at_flags |= ADDRTYPE_PORT_RESOLVED;
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906211822.n5LIMJU1045073>