* - plot the process table, by process size, cpu usage, or total time;
* - plot the logged on users by idle time or cpu usage.
*
- * Copyright (C) 1998 by Stephen Martin (smartin@vanderfleet-martin.net).
+ * Copyright (C) 1998, 2001
+ * by Stephen Martin (smartin@vanderfleet-martin.net).
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* software for any purpose. It is provided "as is" without express or
* implied warranty.
*
- * $Revision: 1.16 $
+ * $Revision: 1.37 $
*
* Version 1.0 April 27, 1998.
* - Initial version
# undef HAVE_PING
#endif
+
+#ifdef HAVE_PING
+# if defined(__DECC) || defined(_IP_VHL)
+ /* This is how you do it on DEC C, and possibly some BSD systems. */
+# define IP_HDRLEN(ip) ((ip)->ip_vhl & 0x0F)
+# else
+ /* This is how you do it on everything else. */
+# define IP_HDRLEN(ip) ((ip)->ip_hl)
+# endif
+#endif /* HAVE_PING */
+
+
/* Forward References */
#ifdef HAVE_PING
/*
* The Bogie.
*
- * This represents an object that is visable on the scope.
+ * This represents an object that is visible on the scope.
*/
typedef struct Bogie {
char *name; /* The name of the thing being displayed */
+ char *desc; /* Beneath the name (e.g., ping time) */
int distance; /* The distance to this thing (0 - 100) */
int tick; /* The tick that it was found on */
int ttl; /* The time to live */
int width, height; /* Window dimensions */
int minx, miny, maxx, maxy, /* Bounds of the scope */
centrex, centrey, radius; /* Parts of the scope circle */
- Bogie *visable; /* List of visable objects */
+ Bogie *visible; /* List of visible objects */
int current; /* Current position of sweep */
int sweepnum; /* The current id of the sweep */
int delay; /* how long between each frame of the anim */
} sonar_info;
static Bool debug_p = False;
+static Bool resolve_p = True;
+static Bool times_p = True;
/*
* A list of targets to ping.
*/
-#ifdef HAVE_PING
typedef struct ping_target {
char *name; /* The name of the target */
+#ifdef HAVE_PING
struct sockaddr address; /* The address of the target */
+#endif /* HAVE_PING */
struct ping_target *next; /* The next one in the list */
} ping_target;
+
+#ifdef HAVE_PING
/*
* Ping Information.
*
"*teamBCount: 4",
"*ping: default",
+ "*resolve: true",
+ "*showTimes: true",
".debug: false",
0
};
{"-team-b-count", ".teamBCount", XrmoptionSepArg, 0 },
{"-ping", ".ping", XrmoptionSepArg, 0 },
+ {"-no-dns", ".resolve", XrmoptionNoArg, "False" },
+ {"-no-times", ".showTimes", XrmoptionNoArg, "False" },
{"-debug", ".debug", XrmoptionNoArg, "True" },
{ 0, 0, 0, 0 }
};
Bogie *new;
+ distance *= 1000;
/* Allocate a bogie and initialize it */
if ((new = (Bogie *) calloc(1, sizeof(Bogie))) == NULL) {
#ifdef HAVE_PING
+/* Packs an IP address quad into bigendian network order. */
+static unsigned long
+pack_addr (unsigned int a, unsigned int b, unsigned int c, unsigned int d)
+{
+ unsigned long i = (((a & 255) << 24) |
+ ((b & 255) << 16) |
+ ((c & 255) << 8) |
+ ((d & 255) ));
+ return htonl (i);
+}
+
+/* Unpacks an IP address quad from bigendian network order. */
+static void
+unpack_addr (unsigned long addr,
+ unsigned int *a, unsigned int *b,
+ unsigned int *c, unsigned int *d)
+{
+ addr = ntohl (addr);
+ *a = (addr >> 24) & 255;
+ *b = (addr >> 16) & 255;
+ *c = (addr >> 8) & 255;
+ *d = (addr ) & 255;
+}
+
+
/*
* Lookup the address for a ping target;
*
static int
lookupHost(ping_target *target)
{
-
struct hostent *hent;
+ struct sockaddr_in *iaddr;
- /* Local Variables */
+ unsigned int ip[4];
+ char c;
+
+ iaddr = (struct sockaddr_in *) &(target->address);
+ iaddr->sin_family = AF_INET;
+
+ if (4 == sscanf (target->name, " %u.%u.%u.%u %c",
+ &ip[0], &ip[1], &ip[2], &ip[3], &c))
+ {
+ /* It's an IP address.
+ */
+ if (ip[3] == 0)
+ {
+ if (debug_p > 1)
+ fprintf (stderr, "%s: ignoring bogus IP %s\n",
+ progname, target->name);
+ return 0;
+ }
+
+ iaddr->sin_addr.s_addr = pack_addr (ip[0], ip[1], ip[2], ip[3]);
+ if (resolve_p)
+ hent = gethostbyaddr ((const char *) &iaddr->sin_addr.s_addr,
+ sizeof(iaddr->sin_addr.s_addr),
+ AF_INET);
+ else
+ hent = 0;
+
+ if (debug_p > 1)
+ fprintf (stderr, "%s: %s => %s\n",
+ progname, target->name,
+ ((hent && hent->h_name && *hent->h_name)
+ ? hent->h_name : "<unknown>"));
- struct sockaddr_in *iaddr;
-
- /* Set up the target address we first assume that the name is the
- IP address as a string */
-
- iaddr = (struct sockaddr_in *) &(target->address);
- iaddr->sin_family = AF_INET;
- if ((iaddr->sin_addr.s_addr = inet_addr(target->name)) >= 0) {
- char ip[4];
- ip[3] = iaddr->sin_addr.s_addr >> 24 & 255;
- ip[2] = iaddr->sin_addr.s_addr >> 16 & 255;
- ip[1] = iaddr->sin_addr.s_addr >> 8 & 255;
- ip[0] = iaddr->sin_addr.s_addr & 255;
- hent = gethostbyaddr (ip, 4, AF_INET);
- if (hent && hent->h_name && *hent->h_name) {
+ if (hent && hent->h_name && *hent->h_name)
target->name = strdup (hent->h_name);
- return 1;
- }
}
+ else
+ {
+ /* It's a host name.
+ */
+
+
+ /* don't waste time being confused by non-hostname tokens
+ in .ssh/known_hosts */
+ if (!strcmp (target->name, "ssh-rsa") ||
+ !strcmp (target->name, "ssh-dsa") ||
+ !strcmp (target->name, "ssh-dss") ||
+ strlen (target->name) >= 80)
+ return 0;
- /* Conversion of IP address failed, try to look the host up by name */
+ hent = gethostbyname (target->name);
+ if (!hent)
+ {
+ fprintf (stderr, "%s: could not resolve host: %s\n",
+ progname, target->name);
+ return 0;
+ }
- hent = gethostbyname(target->name);
- if (hent == NULL) {
- fprintf(stderr, "%s: could not resolve host %s\n",
- progname, target->name);
- return 0;
+ memcpy (&iaddr->sin_addr, hent->h_addr_list[0],
+ sizeof(iaddr->sin_addr));
+
+ if (debug_p > 1)
+ {
+ unsigned int a, b, c, d;
+ unpack_addr (iaddr->sin_addr.s_addr, &a, &b, &c, &d);
+ fprintf (stderr, "%s: %s => %d.%d.%d.%d\n",
+ progname, target->name, a, b, c, d);
+ }
}
- memcpy(&iaddr->sin_addr, hent->h_addr_list[0],
- sizeof(iaddr->sin_addr));
+ return 1;
+}
- /* Done */
- return 1;
+static void
+print_host (FILE *out, unsigned long ip, const char *name)
+{
+ char ips[50];
+ unsigned int a, b, c, d;
+ unpack_addr (ip, &a, &b, &c, &d); /* ip is in network order */
+ sprintf (ips, "%u.%u.%u.%u", a, b, c, d);
+ if (!name || !*name) name = "<unknown>";
+ fprintf (out, "%-16s %s\n", ips, name);
}
+
/*
* Create a target for a host.
*
if (! lookupHost(target))
goto target_init_error;
+ /* Don't ever use loopback (127.0.0.x) hosts */
+ {
+ struct sockaddr_in *iaddr = (struct sockaddr_in *) &(target->address);
+ unsigned long ip = iaddr->sin_addr.s_addr;
+
+ if ((ntohl (ip) & 0xFFFFFF00L) == 0x7f000000L) /* 127.0.0 */
+ {
+ if (debug_p)
+ fprintf (stderr, "%s: ignoring loopback host %s\n",
+ progname, target->name);
+ goto target_init_error;
+ }
+ }
+
/* Done */
if (debug_p)
{
struct sockaddr_in *iaddr = (struct sockaddr_in *) &(target->address);
unsigned long ip = iaddr->sin_addr.s_addr;
- fprintf (stderr, "%s: added host %d.%d.%d.%d (%s)\n", progname,
- ip & 255, ip >> 8 & 255, ip >> 16 & 255, ip >> 24 & 255,
- target->name);
+ fprintf (stderr, "%s: added ", progname);
+ print_host (stderr, ip, target->name);
}
return target;
/* Get the name and address */
name = addr = NULL;
- if ((addr = strtok(buf, " \t\n")) != NULL)
- name = strtok(NULL, " \t\n");
+ if ((addr = strtok(buf, " ,;\t\n")) != NULL)
+ name = strtok(NULL, " ,;\t\n");
else
continue;
addr = NULL;
}
}
- /*printf ("\"%s\" \"%s\"\n", name, addr);*/
+
+ /* If the name is all digits, it's not a name. */
+ if (name)
+ {
+ const char *s;
+ for (s = name; *s; s++)
+ if (*s < '0' || *s > '9')
+ break;
+ if (! *s)
+ {
+ if (debug_p > 1)
+ fprintf (stderr, "%s: skipping bogus name \"%s\" (%s)\n",
+ progname, name, addr);
+ name = NULL;
+ }
+ }
/* Create a new target using first the name then the address */
if (ip1 == ip2)
{
if (debug_p)
- fprintf (stderr, "%s: deleted duplicate: %s\n",
- progname, rest2->next->name);
+ {
+ fprintf (stderr, "%s: deleted duplicate: ", progname);
+ print_host (stderr, ip2, rest2->next->name);
+ }
rest2->next = rest2->next->next;
}
}
/*
* Generate a list ping targets consisting of all of the entries on
- * the same subnet.
+ * the same subnet. 'base' ip is in network order; 0 means localhost.
*
* Returns:
* A list of all of the hosts on this net.
*/
static ping_target *
-subnetHostsList(int base, int subnet_width)
+subnetHostsList(unsigned long n_base, int subnet_width)
{
- unsigned long mask;
+ unsigned long h_mask; /* host order */
+ unsigned long h_base; /* host order */
/* Local Variables */
if (subnet_width < 24)
{
fprintf (stderr,
- "%s: pinging %u hosts is a bad idea; please use a subnet mask of 24 bits\n"
+ "%s: pinging %lu hosts is a bad idea; please use a subnet mask of 24 bits\n"
" or more (255 hosts max.)\n",
- progname, 1L << (32 - subnet_width));
+ progname, (unsigned long) (1L << (32 - subnet_width)) - 1);
exit (1);
}
else if (subnet_width > 30)
/* Construct targets for all addresses in this subnet */
- mask = 0;
+ h_mask = 0;
for (i = 0; i < subnet_width; i++)
- mask |= (1L << (31-i));
+ h_mask |= (1L << (31-i));
/* If no base IP specified, assume localhost. */
- if (base == 0)
- base = ((((unsigned char) hent->h_addr_list[0][0]) << 24) |
- (((unsigned char) hent->h_addr_list[0][1]) << 16) |
- (((unsigned char) hent->h_addr_list[0][2]) << 8) |
- (((unsigned char) hent->h_addr_list[0][3])));
+ if (n_base == 0)
+ n_base = pack_addr (hent->h_addr_list[0][0],
+ hent->h_addr_list[0][1],
+ hent->h_addr_list[0][2],
+ hent->h_addr_list[0][3]);
+ h_base = ntohl (n_base);
+
+ if (h_base == 0x7F000001L) /* 127.0.0.1 in host order */
+ {
+ unsigned int a, b, c, d;
+ unpack_addr (n_base, &a, &b, &c, &d);
+ fprintf (stderr,
+ "%s: unable to determine local subnet address: \"%s\"\n"
+ " resolves to loopback address %u.%u.%u.%u.\n",
+ progname, hostname, a, b, c, d);
+ return NULL;
+ }
for (i = 255; i >= 0; i--) {
- int ip = (base & 0xFFFFFF00) | i;
+ unsigned int a, b, c, d;
+ int ip = (h_base & 0xFFFFFF00L) | i; /* host order */
- if ((ip & mask) != (base & mask)) /* not in the mask range at all */
+ if ((ip & h_mask) != (h_base & h_mask)) /* not in mask range at all */
continue;
- if ((ip & ~mask) == 0) /* broadcast address */
+ if ((ip & ~h_mask) == 0) /* broadcast address */
continue;
- if ((ip & ~mask) == ~mask) /* broadcast address */
+ if ((ip & ~h_mask) == ~h_mask) /* broadcast address */
continue;
- sprintf (address, "%d.%d.%d.%d",
- (ip>>24)&255, (ip>>16)&255, (ip>>8)&255, (ip)&255);
+ unpack_addr (htonl (ip), &a, &b, &c, &d);
+ sprintf (address, "%u.%u.%u.%u", a, b, c, d);
if (debug_p > 1)
- fprintf(stderr, "%s: subnet: %s (%d.%d.%d.%d & %d.%d.%d.%d / %d)\n",
- progname,
- address,
- (base>>24)&255, (base>>16)&255, (base>>8)&255, base&mask&255,
- (mask>>24)&255, (mask>>16)&255, (mask>>8)&255, mask&255,
- subnet_width);
+ {
+ unsigned int aa, ab, ac, ad;
+ unsigned int ma, mb, mc, md;
+ unpack_addr (htonl (h_base & h_mask), &aa, &ab, &ac, &ad);
+ unpack_addr (htonl (h_mask), &ma, &mb, &mc, &md);
+ fprintf (stderr,
+ "%s: subnet: %s (%u.%u.%u.%u & %u.%u.%u.%u / %d)\n",
+ progname, address,
+ aa, ab, ac, ad,
+ ma, mb, mc, md,
+ subnet_width);
+ }
p = address + strlen(address) + 1;
sprintf(p, "%d", i);
pi->targets = delete_duplicate_hosts (pi->targets);
+ if (debug_p)
+ {
+ ping_target *t;
+ fprintf (stderr, "%s: Target list:\n", progname);
+ for (t = pi->targets; t; t = t->next)
+ {
+ struct sockaddr_in *iaddr = (struct sockaddr_in *) &(t->address);
+ unsigned long ip = iaddr->sin_addr.s_addr;
+ fprintf (stderr, "%s: ", progname);
+ print_host (stderr, ip, t->name);
+ }
+ }
+
/* Make sure there is something to ping */
if (pi->targets == NULL) {
ICMP_CHECKSUM(icmph) = 0;
ICMP_ID(icmph) = pi->pid;
ICMP_SEQ(icmph) = pi->seq++;
+# ifdef GETTIMEOFDAY_TWO_ARGS
gettimeofday((struct timeval *) &packet[sizeof(struct ICMP)],
(struct timezone *) 0);
+# else
+ gettimeofday((struct timeval *) &packet[sizeof(struct ICMP)]);
+# endif
+
strcpy((char *) &packet[sizeof(struct ICMP) + sizeof(struct timeval)],
pt->name);
ICMP_CHECKSUM(icmph) = checksum((u_short *)packet, pcktsiz);
/* Local Variables */
struct sockaddr from;
- int fromlen;
+ unsigned int fromlen; /* Posix says socklen_t, but that's not portable */
int result;
u_char packet[1024];
struct timeval now;
char *name;
struct sigaction sa;
struct itimerval it;
+ fd_set rfds;
+ struct timeval tv;
/* Set up a signal to interupt our wait for a packet */
/* Wait for a result packet */
fromlen = sizeof(from);
- while (! timer_expired &&
- (result = recvfrom(pi->icmpsock, packet, sizeof(packet),
- 0, &from, &fromlen)) > 0) {
+ while (! timer_expired) {
+ tv.tv_usec=pi->timeout;
+ tv.tv_sec=0;
+#if 0
+ /* This breaks on BSD, which uses bzero() in the definition of FD_ZERO */
+ FD_ZERO(&rfds);
+#else
+ memset (&rfds, 0, sizeof(rfds));
+#endif
+ FD_SET(pi->icmpsock,&rfds);
+ /* only wait a little while, in case we raced with the timer expiration.
+ From Valentijn Sessink <valentyn@openoffice.nl> */
+ if (select(pi->icmpsock+1, &rfds, NULL, NULL, &tv) >0) {
+ result = recvfrom(pi->icmpsock, packet, sizeof(packet),
+ 0, &from, &fromlen);
/* Check the packet */
+# ifdef GETTIMEOFDAY_TWO_ARGS
gettimeofday(&now, (struct timezone *) 0);
+# else
+ gettimeofday(&now);
+# endif
ip = (struct ip *) packet;
-
- iphdrlen = ip->ip_hl << 2;
- /* On DEC OSF1 4.0, the preceeding line needs to be
- iphdrlen = (ip->ip_vhl & 0x0F) << 2;
- but I don't know how to do this portably. -- jwz.
- */
-
+ iphdrlen = IP_HDRLEN(ip) << 2;
icmph = (struct ICMP *) &packet[iphdrlen];
+ then = (struct timeval *) &packet[iphdrlen + sizeof(struct ICMP)];
+
/* Was the packet a reply?? */
return bl;
}
+# if 0 /* Don't need to do this -- the host names are already as
+ resolved as they're going to get. (We stored the resolved
+ name in the outgoing ping packet, so that same string just
+ came back to us.)
+ */
+
/* If the name is an IP addr, try to resolve it. */
{
int iip[4];
if (4 == sscanf(name, " %d.%d.%d.%d %c",
&iip[0], &iip[1], &iip[2], &iip[3], &c))
{
- unsigned char ip[4];
+ struct sockaddr_in iaddr;
struct hostent *h;
- ip[0] = iip[0]; ip[1] = iip[1]; ip[2] = iip[2]; ip[3] = iip[3];
- h = gethostbyaddr ((char *) ip, 4, AF_INET);
+ iaddr.sin_addr.s_addr = pack_addr (iip[0],iip[1],iip[2],iip[3]);
+ if (resolve_p)
+ h = gethostbyaddr ((const char *) &iaddr.sin_addr.s_addr,
+ sizeof(iaddr.sin_addr.s_addr),
+ AF_INET);
+ else
+ h = 0;
+
if (h && h->h_name && *h->h_name)
{
free (name);
}
}
}
+# endif /* 0 */
/* Create the new Bogie and add it to the list we are building */
new->next = bl;
bl = new;
- /* Compute the round trip time */
+ {
+ float msec = delta(then, &now) / 1000.0;
+
+ if (times_p)
+ {
+ if (new->desc) free (new->desc);
+ new->desc = (char *) malloc (30);
+ if (msec > 99) sprintf (new->desc, " %.0f ms ", msec);
+ else if (msec > 9) sprintf (new->desc, " %.1f ms ", msec);
+ else if (msec > 1) sprintf (new->desc, " %.2f ms ", msec);
+ else sprintf (new->desc, " %.3f ms ", msec);
+ }
+
+ if (debug_p && times_p) /* print ping-like stuff to stdout */
+ {
+ struct sockaddr_in *iaddr = (struct sockaddr_in *) &from;
+ unsigned int a, b, c, d;
+ char ipstr[20];
+ char *s = strdup (new->desc);
+ char *s2 = s, *s3 = s;
+ while (*s2 == ' ') s2++;
+ s3 = strchr (s2, ' ');
+ if (s3) *s3 = 0;
+
+ unpack_addr (iaddr->sin_addr.s_addr, &a, &b, &c, &d);
+ sprintf (ipstr, "%d.%d.%d.%d", a, b, c, d);
+
+ fprintf (stdout,
+ "%3d bytes from %28s: "
+ "icmp_seq=%-4d ttl=%d time=%s ms\n",
+ result,
+ name,
+ /*ipstr,*/
+ ICMP_SEQ(icmph), si->TTL, s2);
+ free (s);
+ }
+
+ /* Don't put anyone *too* close to the center of the screen. */
+ msec += 0.6;
- then = (struct timeval *) &packet[iphdrlen +
- sizeof(struct ICMP)];
- new->distance = delta(then, &now) / 100;
- if (new->distance == 0)
- new->distance = 2; /* HACK */
+ new->distance = msec * 10;
+ }
+ }
}
/* Done */
return NULL;
}
sprintf(si->teamA[i].name, "%s%03d", si->teamAID, i+1);
- si->teamA[i].nexttick = (int) (90.0 * random() / RAND_MAX);
- si->teamA[i].nextdist = (int) (100.0 * random() / RAND_MAX);
+ si->teamA[i].nexttick = random() % 90;
+ si->teamA[i].nextdist = random() % 100;
si->teamA[i].movedonsweep = -1;
}
return NULL;
}
sprintf(si->teamB[i].name, "%s%03d", si->teamBID, i+1);
- si->teamB[i].nexttick = (int) (90.0 * random() / RAND_MAX);
- si->teamB[i].nextdist = (int) (100.0 * random() / RAND_MAX);
+ si->teamB[i].nexttick = random() % 90;
+ si->teamB[i].nextdist = random() % 100;
si->teamB[i].movedonsweep = -1;
}
return si;
}
+/*
+ * Creates and returns a drawing mask for the scope:
+ * mask out anything outside of the disc.
+ */
+static Pixmap
+scope_mask (Display *dpy, Window win, sonar_info *si)
+{
+ XGCValues gcv;
+ Pixmap mask = XCreatePixmap(dpy, win, si->width, si->height, 1);
+ GC gc = XCreateGC (dpy, mask, 0, &gcv);
+ XSetFunction (dpy, gc, GXclear);
+ XFillRectangle (dpy, mask, gc, 0, 0, si->width, si->height);
+ XSetFunction (dpy, gc, GXset);
+ XFillArc(dpy, mask, gc, si->minx, si->miny,
+ si->maxx - si->minx, si->maxy - si->miny,
+ 0, 360 * 64);
+ return mask;
+}
+
+
+static void
+reshape (sonar_info *si)
+{
+ XWindowAttributes xgwa;
+ Pixmap mask;
+ XGetWindowAttributes(si->dpy, si->win, &xgwa);
+ si->width = xgwa.width;
+ si->height = xgwa.height;
+ si->centrex = si->width / 2;
+ si->centrey = si->height / 2;
+ si->maxx = si->centrex + MY_MIN(si->centrex, si->centrey) - 10;
+ si->minx = si->centrex - MY_MIN(si->centrex, si->centrey) + 10;
+ si->maxy = si->centrey + MY_MIN(si->centrex, si->centrey) - 10;
+ si->miny = si->centrey - MY_MIN(si->centrex, si->centrey) + 10;
+ si->radius = si->maxx - si->centrex;
+
+ /* Install the clip mask... */
+ mask = scope_mask (si->dpy, si->win, si);
+ XSetClipMask(si->dpy, si->text, mask);
+ XSetClipMask(si->dpy, si->erase, mask);
+ XFreePixmap (si->dpy, mask); /* it's been copied into the GCs */
+}
+
/*
* Initialize the Sonar.
*
si->dpy = dpy;
si->win = win;
- si->visable = NULL;
+ si->visible = NULL;
+
XGetWindowAttributes(dpy, win, &xwa);
si->cmap = xwa.colormap;
- si->width = xwa.width;
- si->height = xwa.height;
- si->centrex = si->width / 2;
- si->centrey = si->height / 2;
- si->maxx = si->centrex + MY_MIN(si->centrex, si->centrey) - 10;
- si->minx = si->centrex - MY_MIN(si->centrex, si->centrey) + 10;
- si->maxy = si->centrey + MY_MIN(si->centrex, si->centrey) - 10;
- si->miny = si->centrey - MY_MIN(si->centrex, si->centrey) + 10;
- si->radius = si->maxx - si->centrex;
+
si->current = 0;
si->sweepnum = 0;
dpy, si->cmap);
si->grid = XCreateGC (dpy, win, GCForeground, &gcv);
+ reshape (si);
+
/* Compute pixel values for fading text on the display */
XParseColor(dpy, si->cmap,
si->sweep_colors, &si->sweep_segs,
False, True, False);
+ if (si->sweep_segs <= 0)
+ si->sweep_segs = 1;
+
/* Done */
return si;
int xdist, xtick;
- xtick = (int) (3.0 * random() / RAND_MAX) - 1;
- xdist = (int) (11.0 * random() / RAND_MAX) - 5;
+ xtick = (int) (random() % 3) - 1;
+ xdist = (int) (random() % 11) - 5;
if (((t->nexttick + xtick) < 90) && ((t->nexttick + xtick) >= 0))
t->nexttick += xtick;
else
*/
static int
-computeStringX(sonar_info *si, char *label, int x)
+computeStringX(sonar_info *si, const char *label, int x)
{
int width = XTextWidth(si->font, label, strlen(label));
* The y coordinate of the start of the label.
*/
-/* TODO: Add smarts to keep label in sonar screen */
-
static int
computeStringY(sonar_info *si, int y)
{
- int fheight = si->font->ascent + si->font->descent;
- return y + 5 + fheight;
+ int fheight = si->font->ascent /* + si->font->descent */;
+ return y + fheight;
}
/*
*/
static void
-DrawBogie(sonar_info *si, int draw, char *name, int degrees,
- int distance, int ttl, int age)
+DrawBogie(sonar_info *si, int draw, const char *name, const char *desc,
+ int degrees, int distance, int ttl, int age)
{
/* Local Variables */
/* Draw (or erase) the Bogie */
XFillArc(si->dpy, si->win, gc, x, y, 5, 5, 0, 360 * 64);
+
+ x += 3; /* move away from the dot */
+ y += 7;
+ y = computeStringY(si, y);
XDrawString(si->dpy, si->win, gc,
- computeStringX(si, name, x),
- computeStringY(si, y), name, strlen(name));
+ computeStringX(si, name, x), y,
+ name, strlen(name));
+
+ if (desc && *desc)
+ {
+ y = computeStringY(si, y);
+ XDrawString(si->dpy, si->win, gc,
+ computeStringX(si, desc, x), y,
+ desc, strlen(desc));
+ }
}
Bogie *bp, *prev;
int i;
- /* Check for expired tagets and remove them from the visable list */
+ /* Check for expired tagets and remove them from the visible list */
prev = NULL;
- for (bp = si->visable; bp != NULL; bp = bp->next) {
+ for (bp = si->visible; bp != NULL; bp = (bp ? bp->next : 0)) {
/*
- * Remove it from the visable list if it's expired or we have
+ * Remove it from the visible list if it's expired or we have
* a new target with the same name.
*/
if (((bp->tick == si->current) && (++bp->age >= bp->ttl)) ||
(findNode(bl, bp->name) != NULL)) {
- DrawBogie(si, 0, bp->name, bp->tick,
+ DrawBogie(si, 0, bp->name, bp->desc, bp->tick,
bp->distance, bp->ttl, bp->age);
if (prev == NULL)
- si->visable = bp->next;
+ si->visible = bp->next;
else
prev->next = bp->next;
freeBogie(bp);
+ bp = prev;
} else
prev = bp;
}
(4 * 64));
}
- /* Move the new targets to the visable list */
+ /* Move the new targets to the visible list */
for (bp = bl; bp != (Bogie *) 0; bp = bl) {
bl = bl->next;
- bp->next = si->visable;
- si->visable = bp;
+ bp->next = si->visible;
+ si->visible = bp;
}
- /* Draw the visable targets */
+ /* Draw the visible targets */
- for (bp = si->visable; bp != NULL; bp = bp->next) {
+ for (bp = si->visible; bp != NULL; bp = bp->next) {
if (bp->age < bp->ttl) /* grins */
- DrawBogie(si, 1, bp->name, bp->tick, bp->distance, bp->ttl,bp->age);
+ DrawBogie(si, 1, bp->name, bp->desc,
+ bp->tick, bp->distance, bp->ttl,bp->age);
}
/* Redraw the grid */
{
char *source = get_string_resource ("ping", "Ping");
char *token, *end;
+ char dummy;
ping_target *hostlist = 0;
while (token < end)
{
char *next;
+# ifdef HAVE_PING
ping_target *new;
struct stat st;
unsigned int n0=0, n1=0, n2=0, n3=0, m=0;
char d;
+# endif /* HAVE_PING */
for (next = token;
+ *next &&
*next != ',' && *next != ' ' && *next != '\t' && *next != '\n';
next++)
;
return 0;
}
- if ((4 == sscanf (token, "%d.%d.%d/%d %c", &n0,&n1,&n2, &m,&d)) ||
- (5 == sscanf (token, "%d.%d.%d.%d/%d %c", &n0,&n1,&n2,&n3,&m,&d)))
+#ifdef HAVE_PING
+ if ((4 == sscanf (token, "%u.%u.%u/%u %c", &n0,&n1,&n2, &m,&d)) ||
+ (5 == sscanf (token, "%u.%u.%u.%u/%u %c", &n0,&n1,&n2,&n3,&m,&d)))
{
/* subnet: A.B.C.D/M
subnet: A.B.C/M
*/
- unsigned long ip = (n0 << 24) | (n1 << 16) | (n2 << 8) | n3;
+ unsigned long ip = pack_addr (n0, n1, n2, n3);
new = subnetHostsList(ip, m);
}
- else if (4 == sscanf (token, "%d.%d.%d.%d %c", &n0, &n1, &n2, &n3, &d))
+ else if (4 == sscanf (token, "%u.%u.%u.%u %c", &n0, &n1, &n2, &n3, &d))
{
/* IP: A.B.C.D
*/
{
new = subnetHostsList(0, 24);
}
- else if (1 == sscanf (token, "subnet/%d %c", &m))
+ else if (1 == sscanf (token, "subnet/%u %c", &m, &dummy))
{
new = subnetHostsList(0, m);
}
sensor = ping;
}
+#endif /* HAVE_PING */
token = next + 1;
while (token < end &&
}
+static void
+handle_events (sonar_info *si)
+{
+ while (XPending (si->dpy))
+ {
+ XEvent event;
+ XNextEvent (si->dpy, &event);
+
+ if (event.xany.type == ConfigureNotify)
+ {
+ XClearWindow (si->dpy, si->win);
+ reshape (si);
+ }
+
+ screenhack_handle_event (si->dpy, &event);
+ }
+}
+
+
/*
* Main screen saver hack.
long sleeptime;
debug_p = get_boolean_resource ("debug", "Debug");
+ resolve_p = get_boolean_resource ("resolve", "Resolve");
+ times_p = get_boolean_resource ("showTimes", "ShowTimes");
sensor = 0;
+# ifdef HAVE_PING
sensor_info = (void *) init_ping();
+# else /* !HAVE_PING */
+ sensor_info = 0;
+ parse_mode (0); /* just to check argument syntax */
+# endif /* !HAVE_PING */
if (sensor == 0)
{
/* Call the sensor and display the results */
+# ifdef GETTIMEOFDAY_TWO_ARGS
gettimeofday(&start, (struct timezone *) 0);
+# else
+ gettimeofday(&start);
+# endif
bl = sensor(si, sensor_info);
Sonar(si, bl);
if (si->current == 0)
si->sweepnum++;
XSync (dpy, False);
+# ifdef GETTIMEOFDAY_TWO_ARGS
gettimeofday(&finish, (struct timezone *) 0);
+# else
+ gettimeofday(&finish);
+# endif
sleeptime = si->delay - delta(&start, &finish);
- screenhack_handle_events (dpy);
+ handle_events (si);
if (sleeptime > 0L)
usleep(sleeptime);
projects / xscreensaver / blobdiff