5359edc160de518d8e43fdd3448365c15b912c3c galt Mon Jul 22 11:48:10 2019 -0700 Added ipv6 support. Listening processes us hybrid dual stack feature of OS to simplify implementation and use a single listening socket. Works with both TCP and UDP. Parasol working. geoIp also updated and ready for IPv6. Should be invisible to most users, while providing connections via ipv6 where available. Supports both ipv4 and ipv6. diff --git src/parasol/paraNodeStatus/paraNodeStatus.c src/parasol/paraNodeStatus/paraNodeStatus.c index c5f1653..bd8147f 100644 --- src/parasol/paraNodeStatus/paraNodeStatus.c +++ src/parasol/paraNodeStatus/paraNodeStatus.c @@ -32,31 +32,31 @@ void listJobsErr(char *name, int n) /*Report list jobs error. */ { warn("%s: listJobs bad reponse %d", name, n); } void showLong(struct paraMessage *pm, char *name, struct rudp *ru, int *pRunning, int *pRecent) /* Fetch and display response to listJobs message. * Increment running and recent counts. */ { int running, recent, i; struct paraMultiMessage pmm; /* ensure the multi-message response comes from the correct ip and has no duplicate msgs*/ -pmmInit(&pmm, pm, pm->ipAddress.sin_addr); +pmmInit(&pmm, pm); if (!pmmReceive(&pmm, ru)) { warn("%s: no listJobs response", name); return; } running = atoi(pm->data); for (i=0; idata); @@ -92,31 +92,31 @@ /* paraNodeStatus - Check status of paraNode on a list of machines. */ { struct lineFile *lf = lineFileOpen(machineList, FALSE); boolean longFormat = optionExists("long"); char *row[1]; int totalCpu = 0, totalBusy = 0, totalRecent = 0; while (lineFileRow(lf, row)) { char *name = row[0]; struct paraMessage pm; struct rudp *ru = rudpMustOpen(); if (optionExists("retries")) ru->maxRetries = optionInt("retries", 7); - pmInitFromName(&pm, name, paraNodePort); + pmInitFromName(&pm, name, paraNodePortStr); if (longFormat) { pmPrintf(&pm, "%s", "listJobs"); if (pmSend(&pm, ru)) showLong(&pm, name, ru, &totalBusy, &totalRecent); } else { pmPrintf(&pm, "%s", "status"); if (pmSend(&pm, ru)) { if (pmReceive(&pm, ru)) { char *row[3]; printf("%s %s\n", name, pm.data);