From 5c1f2531f2a4970706a157cca3350d0954035fc1 Mon Sep 17 00:00:00 2001 From: Hiroya Ito Date: Tue, 26 Jan 2016 16:56:19 +0900 Subject: [PATCH 1/2] fix typo - quite, qiute => quiet --- README | 4 ++-- README.ja | 4 ++-- README.md | 4 ++-- miruo.c | 18 +++++++++--------- miruo.h | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README b/README index 0a44193..25643a8 100644 --- a/README +++ b/README @@ -45,7 +45,7 @@ usage: miruo [option] [expression] -L, --session-limit=NUM # active session limit. Default 1024 -l, --segment-limit=NUM # active segment limit. Default 65536 -m, --dpi-mode=mode # deep packet inspection mode. (now support only http) - -q, --quite # + -q, --quiet # --all # all session lookup --live # live mode(all segment lookup) @@ -139,7 +139,7 @@ Since it can not capture SYN/BACK, it can not trace TCP If you want to analyze payload of segments to show protocol specific information, specify the mode (protocol name). http: shows HTTP request response information - -q, --quite + -q, --quiet shows simple version of display If you prefer width shorter than 80 characters, you may want to use this option. diff --git a/README.ja b/README.ja index ce4815f..ade768e 100644 --- a/README.ja +++ b/README.ja @@ -47,7 +47,7 @@ usage: miruo [option] [expression] -L, --session-limit=NUM # active session limit. Default 1024 -l, --segment-limit=NUM # active segment limit. Default 65536 -m, --dpi-mode=mode # deep packet inspection mode. (now support only http) - -q, --qiute # + -q, --quiet # --all # all session lookup --live # live mode(all segment lookup) @@ -148,7 +148,7 @@ expressionにはTCPダンプと同じ書式でフィルタを記述できます モード（プロトコル名）を指定します。 http: HTTPリクエスト・レスポンスの情報を表示します - -q, --qiute + -q, --quiet シンプルな表示になります。 横幅が80文字以内じゃないと我慢出来ない場合に指定するとよいかもです。 diff --git a/README.md b/README.md index 2550789..0c33139 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ -L, --session-limit=NUM # active session limit. Default 1024 -l, --segment-limit=NUM # active segment limit. Default 65536 -m, --dpi-mode=mode # deep packet inspection mode. (now support only http) - -q, --qiute # + -q, --quiet # --all # all session lookup --live # live mode(all segment lookup) @@ -155,7 +155,7 @@ -
-q, --qiute
+
-q, --quiet
シンプルな表示になります。 横幅が 80 文字以内じゃないと我慢出来ない場合に指定するとよいかもです。
diff --git a/miruo.c b/miruo.c index 793ad7a..39fb10f 100644 --- a/miruo.c +++ b/miruo.c @@ -32,7 +32,7 @@ void usage() printf(" -L, --session-limit=NUM # active session limit. Default 1024\n"); printf(" -l, --segment-limit=NUM # active segment limit. Default 65536\n"); printf(" -m, --dpi-mode=mode # deep packet inspection mode. (now support only http)\n"); - printf(" -q, --qiute # \n"); + printf(" -q, --quiet # \n"); printf(" --all # all session lookup\n"); printf(" --live # live mode(all segment lookup)\n"); printf("\n"); @@ -995,7 +995,7 @@ void print_tcpsession(FILE *fp, tcpsession *c) uint32_t ct = tcp_connection_time(c); sprintf(ip[0], "%s:%u", inet_ntoa(c->ip[0].sin_addr), c->ip[0].sin_port); sprintf(ip[1], "%s:%u", inet_ntoa(c->ip[1].sin_addr), c->ip[1].sin_port); - if(opt.quite){ + if(opt.quiet){ fprintf(fp, "%s%8u.%03u|%21s == %-21s|%useg(%u)%s\n", cl[0], ct / 1000, @@ -1036,7 +1036,7 @@ void print_tcpsession(FILE *fp, tcpsession *c) } } if(opt.live == 0){ - if(opt.quite){ + if(opt.quiet){ fprintf(fp, "%s%s|%18s %s%s%s %-18s|%08X/%08X%s\n", cl[0], ts, @@ -1200,7 +1200,7 @@ tcpsession *miruo_tcpsession_destroy(tcpsession *c, int view, char *msg, char *r if(opt.live){ fprintf(stdout, "%s%04u:%04u %s %s (%s)%s\n", sc[0], c->sid, c->pkcnt, ts, msg, reason, sc[1]); }else{ - if(opt.quite){ + if(opt.quiet){ fprintf(stdout, "%s%s|%s%s%s|%s%s\n", sc[0], ts, sl, msg, sr, reason, sc[1]); }else{ fprintf(stdout, "%s%04u:%04u %s |%s%s%s| %s%s\n", sc[0], c->sid, c->pkcnt, ts, sl, msg, sr, reason, sc[1]); @@ -1314,10 +1314,10 @@ tcpsession *miruo_tcpsession_connect(tcpsession *c, tcpsession *s, int *connect) return(c); } opt.count_ts_error++; - miruo_tcpsession_destroy(c, (opt.quite < 2), "error break", "Duplicate connection(packet loss?)"); + miruo_tcpsession_destroy(c, (opt.quiet < 2), "error break", "Duplicate connection(packet loss?)"); if(c = add_tcpsession(s)){ *connect = 1; - if(opt.quite < 1){ + if(opt.quiet < 1){ c->segment.color = COLOR_RED; c->view = 1; }else{ @@ -1854,7 +1854,7 @@ int miruo_init() { memset(&opt, 0, sizeof(opt)); opt.loop = 1; - opt.quite = 0; + opt.quiet = 0; opt.promisc = 1; opt.viewdata = 0; opt.fragment = 1; @@ -1880,7 +1880,7 @@ struct option *get_optlist() "version", 0, NULL, 'V', "all", 0, NULL, 500, "live", 0, NULL, 501, - "quite", 0, NULL, 'q', + "quiet", 0, NULL, 'q', "fragment", 1, NULL, 'F', "flagment", 1, NULL, 'F', "color", 1, NULL, 'C', @@ -1922,7 +1922,7 @@ void miruo_setopt(int argc, char *argv[]) version(); miruo_finish(0); case 'q': - opt.quite++; + opt.quiet++; break; case 'F': if(is_numeric(optarg)){ diff --git a/miruo.h b/miruo.h index 659b7b9..480587a 100644 --- a/miruo.h +++ b/miruo.h @@ -216,7 +216,7 @@ typedef struct miruopt int mode; // 動作モード。mオプションの値で決定 int all; // 1なら全セッション表示する int live; // 1ならリアルタイム表示する - int quite; // 疑わしきは罰しないモード + int quiet; // 疑わしきは罰しないモード int color; // カラー表示を有効にするかどうか int lktype; // データリンク層の種別 int pksize; // キャプチャサイズ From f36de1cad54a515c549a040929e0c1c2427bb27e Mon Sep 17 00:00:00 2001 From: pandax381 Date: Tue, 26 Jan 2016 17:26:55 +0900 Subject: [PATCH 2/2] 0.9.6b --- ChangeLog | 3 +++ configure.ac | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9adf628..4275663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2016/01/26: Ver 0.9.6b +- fixed typo (quite, qiute => quiet) + 2015/05/20: Ver 0.9.6a - fixed OSX 10.8 and earlier diff --git a/configure.ac b/configure.ac index 5768727..5782bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT(miruo, 0.9.6a, info-miruo@klab.com) +AC_INIT(miruo, 0.9.6b, info-miruo@klab.com) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([miruo.c]) AC_CONFIG_HEADER([config.h])