linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make portnum command work on UDP ports too

Browse Source
This commit is contained in:
Douglas Clowes
2012-12-13 13:52:52 +11:00
parent 6ca55df3d6
commit da33f7ed21
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
site_ansto/anstoutil.c
View File

@ -151,6 +151,7 @@ int getPortNum(SConnection *pCon, char *portName) {
if (fp == NULL) if (fp == NULL)
fp = fopen("sics_test_services", "r"); fp = fopen("sics_test_services", "r");
if (fp != NULL) { if (fp != NULL) {
int udp_port = 0;
while ((cp = fgets(line, sizeof(line)-1, fp)) != NULL) { while ((cp = fgets(line, sizeof(line)-1, fp)) != NULL) {
if (*cp != '#' && *cp != '\0') { if (*cp != '#' && *cp != '\0') {
char name[132], *np; char name[132], *np;
@ -161,19 +162,21 @@ int getPortNum(SConnection *pCon, char *portName) {
} }
if (strcasecmp(portName, name) != 0) if (strcasecmp(portName, name) != 0)
continue; continue;
while (*cp && isblank(*cp)) { while (*cp && isblank(*cp))
++cp; ++cp;
}
if (*cp && isdigit(*cp)) { if (*cp && isdigit(*cp)) {
long port; long port;
port = strtol(cp, &np, 10); port = strtol(cp, &np, 10);
if (strncasecmp("/tcp", np, 4) == 0) { if (strncasecmp("/tcp", np, 4) == 0)
return (int) port; return (int) port;
} if (strncasecmp("/udp", np, 4) == 0)
udp_port = (int) port;
} }
} }
} }
fclose(fp); fclose(fp);
if (udp_port > 0)
return udp_port;
} }
} while (0); } while (0);
sp = getservbyname(portName, NULL); sp = getservbyname(portName, NULL);