Commit: 876a6023572985e65dd35daabfbd9a799af16259 - ogatool (git)

oga's tools

Commit MetaInfo

• Revision: 876a6023572985e65dd35daabfbd9a799af16259 (tree)
• Time: 2022-05-13 15:07:38
• Author: hyperoga <hyperoga@gmai...>
• Commiter: hyperoga

Log Message

update V0.15, V0.16

Change Summary

• modified: tcpan.c

Incremental Difference

--- a/tcpan.c
+++ b/tcpan.c
@@ -14,6 +14,8 @@
  *  14/10/18 V0.12 support -n, -raw option
  *  14/10/18 V0.13 support time-only format
  *  14/10/23 V0.14 fix last data print, unprintable char proc
+ *  22/04/19 V0.15 support latest export format
+ *  22/04/20 V0.16 support -ip -csv
  *
  */
 
@@ -21,12 +23,13 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
+#include <ctype.h>   /* V0.16-A */
 #ifdef _WIN32
 #include <windows.h>
 #include <sys/utime.h>
 #endif  /* _WIN32 */
 
-#define VER "0.14"
+#define VER "0.16"
 
 #define	dprintf   if (vf) printf
 #define	dprintf2  if (vf >= 2) printf
@@ -34,6 +37,7 @@
 
 #define MAX_NTCPDATA 200000
 #define MAX_NPORTID  50000
+#define MAX_IPLIST   2     /* V0.16-A */
 
 #define KEY_TCP     "Transmission"
 #define KEY_PKTDATA "0030"
@@ -45,6 +49,7 @@ typedef struct _tcpdata {
     char  srcip[16];       /* xxx.xxx.xxx.xxx */
     char  dstip[16];       /* xxx.xxx.xxx.xxx */
     char  proto[16];       /* protocol        */
+    char  len[16];         /* length          V0.15-A */
     char  info[100];
     char  portid[12];      /* <port1>-<port2> , port1 < port2 */
     int   srcport;
@@ -61,11 +66,15 @@ int portf   = 0;           /* -port              V0.11-A */
 int cnt     = 0;           /* frm data count  */
 int nportid = 0;           /* num of portid   */
 int contf   = 0;           /* . continue flag    V0.12-A V0.14-M */
+int oldf    = 0;           /* -oldf old format(no Length) V0.15-A */
+int ipcnt   = 0;           /* -ip   ip addr count         V0.16-A */
+int csvf    = 0;           /* -csv  output csv format     V0.16-A */
 int max_ntcpdata = MAX_NTCPDATA; /* default num of data V0.11-A */
 tcpdata_t *tcpdatas = NULL;
 char      **portids = NULL;
 char      *start_time = "00:00:00.000000";
 char      *end_time   = "99:99:99.999999";
+char iplist[MAX_IPLIST][32]; /* -ip target IP list      V0.16-A */
 
 /*
  *   不定長のデータをコピーし、次のデータ項目に位置づける  
@@ -124,6 +133,11 @@ void GetSummary(char *buf, tcpdata_t *tcpdatp)
 	CopyWord(tcpdatp->srcip, sizeof(tcpdatp->srcip), &pt, ' '); /* copy source ip */
 	CopyWord(tcpdatp->dstip, sizeof(tcpdatp->dstip), &pt, ' '); /* copy dest   ip */
 	CopyWord(tcpdatp->proto, sizeof(tcpdatp->proto), &pt, ' '); /* copy protocol  */
+	/* V0.15-A start */
+	if (!oldf) {
+		CopyWord(tcpdatp->len, sizeof(tcpdatp->len), &pt, ' '); /* copy length    */
+	}
+	/* V0.15-A end   */
 	CopyWord(tcpdatp->info,  sizeof(tcpdatp->info), &pt, '\n'); /* copy info      */
 	/* V0.11-A start */
 	if (tcpdatp->info[strlen(tcpdatp->info)-1] == 0x0d) {
@@ -140,16 +154,33 @@ void GetPortNo(char *buf, tcpdata_t *tcpdatp)
 {
 	char *pt = buf;
 
-	/* search source port */
-	pt = strchr(pt, '(');
-	if (pt) {
-		tcpdatp->srcport = atoi(++pt);
-	}
-	/* search dest port */
-	pt = strchr(pt, '(');
-	if (pt) {
-		tcpdatp->dstport = atoi(++pt);
-	}
+	dprintf3("### Start GetPortNo\n");
+
+	if (oldf) {    /* V0.15-A */
+		/* search source port */
+		pt = strchr(pt, '(');
+		if (pt) {
+			tcpdatp->srcport = atoi(++pt);
+		}
+		/* search dest port */
+		pt = strchr(pt, '(');
+		if (pt) {
+			tcpdatp->dstport = atoi(++pt);
+		}
+	} else {       /* V0.15-A start */
+		/* search source port */
+		pt = strstr(pt, "Src Port:");
+		if (pt) {
+			pt += 10;
+			tcpdatp->srcport = atoi(pt);
+		}
+		/* search dest port */
+		pt = strstr(pt, "Dst Port:");
+		if (pt) {
+			pt += 10;
+			tcpdatp->dstport = atoi(pt);
+		}
+	}              /* V0.15-A end   */
 
 	/* search Seq number */
 	pt = strstr(pt, "Seq:");
@@ -163,6 +194,8 @@ void GetPortNo(char *buf, tcpdata_t *tcpdatp)
 		pt += 5;
 		tcpdatp->ack = atoi(pt);
 	}
+
+	dprintf3("### end   GetPortNo\n");
 }
 
 /*
@@ -266,7 +299,7 @@ void GetPktData(char *ibuf, tcpdata_t *tcpdatp, FILE *fp)
 	strcpy(buf, ibuf);
 	contf = 0;                          /* V0.14-A */
 	do {
-		if (strlen(buf) >= 8) {
+		if (strlen(buf) >= 8 && buf[4] == ' ') { /* V0.15-C */
 			/* 0000  00 01 02 03... */
 			hex2str(&buf[6], wkstr);
 			if (vf) printf("buf:[%s]=>wkstr:[%s]\n", buf, wkstr);
@@ -311,8 +344,43 @@ void PrintTcpDat(tcpdata_t *tcpdatp)
 		printf("@@@@@ [%s]\n", tcpdatp->pktdata); fflush(stdout);
 		printf("@@@@@ end\n"); fflush(stdout);
 	}
+	/* V0.16-A start */
+	if (ipcnt) {
+		if (ipcnt == 1) {
+			/* allow specified ip */
+			if (strcmp(tcpdatp->srcip, iplist[0]) && strcmp(tcpdatp->dstip, iplist[0])) {
+				if (vf) fflush(stdout);
+				return;
+			}
+		} else if (ipcnt == 2) {
+			if (!strcmp(tcpdatp->srcip, iplist[0]) && !strcmp(tcpdatp->dstip, iplist[1]) ||
+			    !strcmp(tcpdatp->srcip, iplist[1]) && !strcmp(tcpdatp->dstip, iplist[0])) {
+				/* allow specified ip pair */
+			} else {
+				if (vf )fflush(stdout);
+				return;
+			}
+		}
+	}
+	/* V0.16-A end   */
+
 	/* No date time portid src(port) dst(port) protocol Seq Ack info pktdat */
-	printf("%7d %s %s %11s %15s(%5d) %15s(%5d) Seq:%5u Ack:%5u %8s %s",
+	if (csvf) {                                   /* V0.16-A start */
+		printf("%7d,%s,%s,%11s,%15s(%5d),%15s(%5d),Seq:%5u,Ack:%5u,%8s,%s",
+		   tcpdatp->frmno,
+		   tcpdatp->date,
+		   tcpdatp->time,
+		   tcpdatp->portid,
+		   tcpdatp->srcip,
+		   tcpdatp->srcport,
+		   tcpdatp->dstip,
+		   tcpdatp->dstport,
+		   tcpdatp->seq,             /* option */
+		   tcpdatp->ack,             /* option */
+		   tcpdatp->proto,
+		   tcpdatp->info);
+	} else {                                      /* V0.16-A end */
+		printf("%7d %s %s %11s %15s(%5d) %15s(%5d) Seq:%5u Ack:%5u %8s %s",
 		   tcpdatp->frmno,
 		   tcpdatp->date,
 		   tcpdatp->time,
@@ -325,8 +393,14 @@ void PrintTcpDat(tcpdata_t *tcpdatp)
 		   tcpdatp->ack,             /* option */
 		   tcpdatp->proto,
 		   tcpdatp->info);
+	}                                             /* V0.16-A */
+
 	if (tcpdatp->pktdata) {
-		printf(" [%s]\n", tcpdatp->pktdata);
+		if (csvf) {                               /* V0.16-A */
+			printf(",[%s]\n", tcpdatp->pktdata);  /* V0.16-A */
+		} else {                                  /* V0.16-A */
+			printf(" [%s]\n", tcpdatp->pktdata);
+		}                                         /* V0.16-A */
 	} else {
 		printf("\n");
 	}
@@ -350,6 +424,7 @@ void ReadTcpFile(char *fname)
 	newdata = 0;
     while(fgets(buf, sizeof(buf), fp)) {
 		if (!strncmp(buf, "No.", 3)) {
+			dprintf3("### read packet: %s", buf);   /* V0.15-A */
 			newdata = 1;
 			if (tcpdat.frmno > 0) {      /* 1回目は出力されないようにする */
 				/* 前回データの登録 (for -port) */
@@ -407,12 +482,18 @@ void DispByEachPortid()
 void usage()
 {
     printf("tcpan ver. %s\n", VER);
-    printf("usage: tcpan [-port] [-raw] [-n] [-s <start_time>] [-e <end_time>] <wireshark_exp_file.txt>\n");
+    printf("usage: tcpan [-port] [-raw] [-n] [-oldf] [-csv]\n");
+	printf("             [-s <start_time>] [-e <end_time>]\n");
+	printf("             [-ip <ip_addr1> [-ip <ip_addr2>]]\n");
+	printf("             <wireshark_exp_file.txt>\n");
     printf("  -port: disp each communication port.\n");
     printf("  -raw : output raw packet data.\n");
+    printf("  -ip  : filter by ip addr.\n");                   /* V0.16-A */
     printf("  -n   : allocates memory by num of data.\n");
     printf("  -s   : start time. (%s)\n", start_time);
     printf("  -e   : end time.   (%s)\n", end_time);
+    printf("  -oldf: old input file format (no Length)\n");    /* V0.15-A */
+    printf("  -csv : output csv format\n");                    /* V0.16-A */
     printf("  Wireshark Export Option\n");
     printf("    [File]=>[Export]=>[File]\n");
     printf("       [v]Packet summary line\n");
@@ -438,6 +519,23 @@ int main(int a, char *b[])
             continue;
         }
 		/* V0.11-A end   */
+		/* V0.15-A start */
+        if (!strcmp(b[i], "-oldf")) {
+            oldf = 1;
+            continue;
+        }
+		/* V0.15-A end   */
+		/* V0.16-A start */
+        if (!strcmp(b[i], "-ip") && a > i+1) {
+			if (ipcnt >= 2) usage();
+			strcpy(iplist[ipcnt++], b[++i]);
+            continue;
+        }
+        if (!strcmp(b[i], "-csv")) {
+            csvf = 1;
+            continue;
+        }
+		/* V0.16-A end   */
         if (!strcmp(b[i], "-v")) {
             ++vf;
             continue;