From d5cfcb93978411fe7335e906e71a500a31068e36 Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Sun, 16 Sep 2007 12:43:26 +0000 Subject: [PATCH] Inserted some extra code to test --- ChangeLog | 1 + mbtask/scanout.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31c72132..5b54e1e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ v0.91.11 02-Sep-2007 mbtask: Added some debug logging to investigate a problem with outbound scanning. + Inserted some extra code to test.. v0.91.10 21-Aug-2007 - 02-Sep-2007 diff --git a/mbtask/scanout.c b/mbtask/scanout.c index b0ecbd24..509ba641 100644 --- a/mbtask/scanout.c +++ b/mbtask/scanout.c @@ -59,6 +59,7 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo struct dirent *de; int rc = 0, isflo, fage; time_t t_start; + unsigned short t_net, t_node, t_point; t_start = time(NULL); fname = calloc(PATH_MAX, sizeof(char)); @@ -85,7 +86,9 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo strncat(fname,de->d_name,PATH_MAX-strlen(fname)-2); if ((strcasecmp(de->d_name+9,"pnt") == 0) && !ispoint) { - sscanf(de->d_name,"%04x%04x",&addr.net,&addr.node); + sscanf(de->d_name,"%04hx%04hx",&t_net,&t_node); + addr.net = t_net; + addr.node = t_node; Syslog('m', "sscanf 1 \"%s\" \"%s\" => %d %d", dname, de->d_name, addr.net, addr.node); if ((rc = scan_dir(fn, fname, 1))) goto exout; @@ -106,10 +109,13 @@ static int scan_dir(int (*fn)(faddr *, char, int, char *), char *dname, int ispo (strcasecmp(de->d_name+8,".req") == 0) || (strcasecmp(de->d_name+8,".pol") == 0)) { if (ispoint) { - sscanf(de->d_name,"%08x", &addr.point); + sscanf(de->d_name,"%08hx", &t_point); + addr.point = t_point; Syslog('m', "sscanf 3 \"%s\" \"%s\" => %d %d %d", dname, de->d_name, addr.net, addr.node, addr.point); } else { - sscanf(de->d_name,"%04x%04x", &addr.net,&addr.node); + sscanf(de->d_name,"%04hx%04hx", &t_net,&t_node); + addr.net = t_net; + addr.node = t_node; Syslog('m', "sscanf 2 \"%s\" \"%s\" => %d %d", dname, de->d_name, addr.net, addr.node); } flavor = tolower(de->d_name[9]);