🚀 go-pugleaf

Hi,

hier nun der versprochene Patch (hatte ich ganz vergessen...)

120a121,123
>   int hostnameflag = 0;
>   int innerloop = 0;
>   int innerlooperr = 0;
251a255,256
>           if (0 == strcmp(p, "-"))
>             hostnameflag=1;
263c268,269
< 		  (0 != strncmp(logmsg, "Incoming call", 13)) &&
---
> 		  (0 != strncmp(logmsg, "Handshake successful", 20)) &&
> 		  (0 != strncmp(logmsg, "ERROR", 5)) &&
324a331
>               innerloop = 1;
332c339
< 	  if (0 == strncmp(logmsg, "Incoming call", 13))
---
> 	  if ((hostnameflag == 1) && (0 == strncmp(logmsg, "Handshake successful", 20)))
334a342,343
>               hostnameflag=0;
>               innerloop = 1;
338a348,354
> 
> 	  if ((innerlooperr == 0) && (innerloop == 1) && (0 == strncmp(logmsg, "ERROR", 5)))
> 	    {
> 	      cur->call[called].succs -= 1;
>               innerlooperr = 1;
> 	      continue;
> 	    }
344a361
>               innerloop = innerlooperr = 0;
387,388c404,405
<       printf("     sysname   callto    failto    totime    callfm    failfm    fmtime\n");
<       printf("     --------  --------  --------  --------  --------  --------  --------\n");
---
>       printf("     sysname         callto    failto    totime    callfm    failfm    fmtime\n");
>       printf("     --------------  --------  --------  --------  --------  --------  --------\n");
390c407,408
< 	printf("     %-8s  %-8d  %-8d  %-8.0f  %-8d  %-8d  %-8.0f\n",
---
>         if (0 != strncmp(cur->Hostname, "-", 1))
> 	printf("     %-14s  %-8d  %-8d  %-8.0f  %-8d  %-8d  %-8.0f\n",
408,409c426,427
< 	  printf("     sysname   files     bytes     seconds   byte/sec\n");
< 	  printf("     --------  --------  --------  --------  --------\n");
---
> 	  printf("     sysname         files     bytes     seconds   byte/sec\n");
> 	  printf("     --------------  --------  --------  --------  --------\n");
421c439,440
< 	      printf("     %-8s  %-8d  %-8ld  %-8.0f  %-8.2f\n",
---
>               if (0 != strncmp(cur->Hostname, "-", 1))
> 	      printf("     %-14s  %-8d  %-8ld  %-8.0f  %-8.2f\n",
440,441c459,460
<       printf("     sysname   conntime  flowtime  ovhdtime  effcy (%%)\n");
<       printf("     --------  --------  --------  --------  --------\n");
---
>       printf("     sysname         conntime  flowtime  ovhdtime  effcy (%%)\n");
>       printf("     --------------  --------  --------  --------  --------\n");
448c467,468
< 	  printf("     %-8s  %-8.0f  %-8.0f  %-8.0f  %-2.2f%%\n",
---
>           if (0 != strncmp(cur->Hostname, "-", 1))
> 	  printf("     %-14s  %-8.0f  %-8.0f  %-8.0f  %-2.2f%%\n",
460,461c480,481
<       printf("     sysname   rmail     rnews     other\n");
<       printf("     --------  --------  --------  --------\n");
---
>       printf("     sysname         rmail     r[cf]smtp rnews     other\n");
>       printf("     --------------  --------  --------- --------  --------\n");
464c484
<           int rmail, rnews, other;
---
>           int rmail, rsmtp, rnews, other;
468c488
<           rmail = rnews = other = 0;
---
>           rmail = rsmtp = rnews = other = 0;
474a495,500
> 	      else if (strcmp(cmd->Commandname, "rcsmtp") == 0)
> 		rsmtp += cmd->count;
> 	      else if (strcmp(cmd->Commandname, "rfsmtp") == 0)
> 		rsmtp += cmd->count;
> 	      else if (strcmp(cmd->Commandname, "rsmtp") == 0)
> 		rsmtp += cmd->count;
478,479c504,506
< 	  printf("     %-8s  %-8d  %-8d  %-8d\n", cur->Hostname,
< 		 rmail, rnews, other);
---
>           if (0 != strncmp(cur->Hostname, "-", 1))
> 	  printf("     %-14s  %-8d  %-8d  %-8d  %-8d\n", cur->Hostname,
> 		 rmail, rsmtp, rnews, other);
-- 
Mike Fleischer        | mike@oytix.north.de  (Private E-Mail)
Hans-Boeckler-Str. 61 | f14a@alf.zfn.uni-bremen.de (Uni Bremen)
2800 Bremen 1         | " Nur wer seinen eigenen Untergang sieht,
+49 421 394572        |   wird uebrigbleiben... " - Unknown