From 067dd27b706ce5a261fc0252f2bceea7b57605d6 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 28 Feb 2018 04:59:12 +0000 Subject: [PATCH] spelling: promiscuous --- src/Cedar/BridgeUnix.c | 2 +- src/Cedar/EM.c | 4 ++-- src/Cedar/EtherLog.c | 16 ++++++++-------- src/Cedar/EtherLog.h | 6 +++--- src/PenCore/PenCore.rc | 2 +- src/PenCore/resource.h | 2 +- src/bin/hamcore/strtable_cn.stb | 2 +- src/bin/hamcore/strtable_en.stb | 2 +- src/bin/hamcore/strtable_ja.stb | 2 +- src/bin/hamcore/strtable_ko.stb | 2 +- src/bin/hamcore/strtable_tw.stb | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Cedar/BridgeUnix.c b/src/Cedar/BridgeUnix.c index bb7ca970..54b76cdf 100644 --- a/src/Cedar/BridgeUnix.c +++ b/src/Cedar/BridgeUnix.c @@ -648,7 +648,7 @@ ETH *OpenEthLinux(char *name, bool local, bool tapmode, char *tapaddr) if (local == false) { - // Enable promiscious mode + // Enable promiscuous mode Zero(&ifr, sizeof(ifr)); StrCpy(ifr.ifr_name, sizeof(ifr.ifr_name), name); if (ioctl(s, SIOCGIFFLAGS, &ifr) < 0) diff --git a/src/Cedar/EM.c b/src/Cedar/EM.c index 58719a4b..71c3fbfe 100644 --- a/src/Cedar/EM.c +++ b/src/Cedar/EM.c @@ -781,7 +781,7 @@ void EmAddInit(HWND hWnd, EM_ADD *p) // Edit mode (to obtain a configuration) wchar_t tmp[MAX_PATH]; RPC_ADD_DEVICE t; - Hide(hWnd, R_PROMISCUS); + Hide(hWnd, R_PROMISCUOUS); Zero(&t, sizeof(t)); StrCpy(t.DeviceName, sizeof(t.DeviceName), p->DeviceName); @@ -827,7 +827,7 @@ void EmAddOk(HWND hWnd, EM_ADD *p) if (p->NewMode) { - t.NoPromiscus = IsChecked(hWnd, R_PROMISCUS); + t.NoPromiscuous = IsChecked(hWnd, R_PROMISCUOUS); } if (p->NewMode) diff --git a/src/Cedar/EtherLog.c b/src/Cedar/EtherLog.c index 5c65b2d1..c32421e7 100644 --- a/src/Cedar/EtherLog.c +++ b/src/Cedar/EtherLog.c @@ -444,7 +444,7 @@ UINT EtSetPassword(EL *e, RPC_SET_PASSWORD *t) // Add a device UINT EtAddDevice(EL *e, RPC_ADD_DEVICE *t) { - if (ElAddCaptureDevice(e, t->DeviceName, &t->LogSetting, t->NoPromiscus) == false) + if (ElAddCaptureDevice(e, t->DeviceName, &t->LogSetting, t->NoPromiscuous) == false) { return ERR_CAPTURE_DEVICE_ADD_ERROR; } @@ -485,7 +485,7 @@ UINT EtGetDevice(EL *e, RPC_ADD_DEVICE *t) ret = ERR_NO_ERROR; Copy(&t->LogSetting, &d->LogSetting, sizeof(HUB_LOG)); - t->NoPromiscus = d->NoPromiscus; + t->NoPromiscuous = d->NoPromiscuous; } } UnlockList(e->DeviceList); @@ -583,7 +583,7 @@ void InRpcAddDevice(RPC_ADD_DEVICE *t, PACK *p) Zero(t, sizeof(RPC_ADD_DEVICE)); PackGetStr(p, "DeviceName", t->DeviceName, sizeof(t->DeviceName)); - t->NoPromiscus = PackGetInt(p, "NoPromiscus"); + t->NoPromiscuous = PackGetInt(p, "NoPromiscuous"); t->LogSetting.PacketLogSwitchType = PackGetInt(p, "PacketLogSwitchType"); for (i = 0;i < NUM_PACKET_LOG;i++) @@ -602,7 +602,7 @@ void OutRpcAddDevice(PACK *p, RPC_ADD_DEVICE *t) } PackAddStr(p, "DeviceName", t->DeviceName); - PackAddInt(p, "NoPromiscus", t->NoPromiscus); + PackAddInt(p, "NoPromiscuous", t->NoPromiscuous); PackAddInt(p, "PacketLogSwitchType", t->LogSetting.PacketLogSwitchType); for (i = 0;i < NUM_PACKET_LOG;i++) @@ -969,7 +969,7 @@ bool ElDeleteCaptureDevice(EL *e, char *name) } // Add a capture device -bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus) +bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscuous) { EL_DEVICE *d, t; // Validate arguments @@ -995,7 +995,7 @@ bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus) d = ZeroMalloc(sizeof(EL_DEVICE)); StrCpy(d->DeviceName, sizeof(d->DeviceName), name); Copy(&d->LogSetting, log, sizeof(HUB_LOG)); - d->NoPromiscus = no_promiscus; + d->NoPromiscuous = no_promiscuous; d->el = e; Insert(e->DeviceList, d); @@ -1091,7 +1091,7 @@ void ElSaveConfigToFolder(EL *e, FOLDER *root) f = CfgCreateFolder(devices, d->DeviceName); SiWriteHubLogCfgEx(f, &d->LogSetting, true); - CfgAddBool(f, "NoPromiscusMode", d->NoPromiscus); + CfgAddBool(f, "NoPromiscuousMode", d->NoPromiscuous); } } UnlockList(e->DeviceList); @@ -1157,7 +1157,7 @@ void ElLoadConfigFromFolder(EL *e, FOLDER *root) Zero(&g, sizeof(g)); SiLoadHubLogCfg(&g, f); - ElAddCaptureDevice(e, name, &g, CfgGetBool(f, "NoPromiscusMode")); + ElAddCaptureDevice(e, name, &g, CfgGetBool(f, "NoPromiscuousMode")); } } FreeToken(t); diff --git a/src/Cedar/EtherLog.h b/src/Cedar/EtherLog.h index beb707f6..593ecd55 100644 --- a/src/Cedar/EtherLog.h +++ b/src/Cedar/EtherLog.h @@ -133,7 +133,7 @@ struct RPC_ADD_DEVICE { char DeviceName[MAX_SIZE]; // Device name HUB_LOG LogSetting; // Log settings - bool NoPromiscus; // Without promiscuous mode + bool NoPromiscuous; // Without promiscuous mode }; struct RPC_DELETE_DEVICE @@ -173,7 +173,7 @@ struct EL_DEVICE CANCEL *Cancel2; // Cancel 2 volatile bool Halt; // Halting flag bool Active; // Running flag - bool NoPromiscus; // Without promiscuous mode + bool NoPromiscuous; // Without promiscuous mode LOG *Logger; // Logger }; @@ -219,7 +219,7 @@ void ElLoadConfigFromFolder(EL *e, FOLDER *root); void ElSaveConfig(EL *e); void ElSaveConfigToFolder(EL *e, FOLDER *root); int ElCompareDevice(void *p1, void *p2); -bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscus); +bool ElAddCaptureDevice(EL *e, char *name, HUB_LOG *log, bool no_promiscuous); bool ElDeleteCaptureDevice(EL *e, char *name); bool ElSetCaptureDeviceLogSetting(EL *e, char *name, HUB_LOG *log); void ElCaptureThread(THREAD *thread, void *param); diff --git a/src/PenCore/PenCore.rc b/src/PenCore/PenCore.rc index c1e7cef1..e9959b1f 100644 --- a/src/PenCore/PenCore.rc +++ b/src/PenCore/PenCore.rc @@ -2950,7 +2950,7 @@ BEGIN GROUPBOX "@STATIC1",-1,7,5,265,51 ICON ICO_NIC_ONLINE,-1,14,17,20,18 COMBOBOX C_DEVICE,37,22,226,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "@R_PROMISCUS",R_PROMISCUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,37,223,11 + CONTROL "@R_PROMISCUOUS",R_PROMISCUOUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,37,223,11 GROUPBOX "@STATIC2",-1,7,69,265,172 ICON ICO_USER_ADMIN,-1,14,80,20,18 RTEXT "@S_PACKET",S_PACKET,39,86,98,9 diff --git a/src/PenCore/resource.h b/src/PenCore/resource.h index c3972f11..aa6d1eb3 100644 --- a/src/PenCore/resource.h +++ b/src/PenCore/resource.h @@ -711,7 +711,7 @@ #define S_TSUKUBA2 1281 #define IDC_CHECK1 1285 #define R_NO_SAVE_PASSWORD 1285 -#define R_PROMISCUS 1285 +#define R_PROMISCUOUS 1285 #define R_NO_ENUM 1285 #define R_ETHERNET 1285 #define R_CONTROLLER_ONLY 1285 diff --git a/src/bin/hamcore/strtable_cn.stb b/src/bin/hamcore/strtable_cn.stb index 576c21f2..289e31ca 100644 --- a/src/bin/hamcore/strtable_cn.stb +++ b/src/bin/hamcore/strtable_cn.stb @@ -3230,7 +3230,7 @@ IDCANCEL 关闭(&X) PREFIX D_EM_ADD STATIC1 用于捕获的网络适配器名称(&L): -R_PROMISCUS 捕获时不要使用混杂模式(&N) +R_PROMISCUOUS 捕获时不要使用混杂模式(&N) STATIC2 数据包日志 (&P) : S_PACKET 日志文件切换周期 (&W) : S_PACKET_0 TCP 连接日志: diff --git a/src/bin/hamcore/strtable_en.stb b/src/bin/hamcore/strtable_en.stb index d615c290..b6826f4a 100644 --- a/src/bin/hamcore/strtable_en.stb +++ b/src/bin/hamcore/strtable_en.stb @@ -3212,7 +3212,7 @@ IDCANCEL E&xit PREFIX D_EM_ADD STATIC1 Name of Network Adapter Used for Capture: -R_PROMISCUS Do&n't Use Promiscuous Mode During Capture +R_PROMISCUOUS Do&n't Use Promiscuous Mode During Capture STATIC2 &Packet Log: S_PACKET Log File S&witch Cycle: S_PACKET_0 TCP Connection Log: diff --git a/src/bin/hamcore/strtable_ja.stb b/src/bin/hamcore/strtable_ja.stb index cc245589..16e400ab 100644 --- a/src/bin/hamcore/strtable_ja.stb +++ b/src/bin/hamcore/strtable_ja.stb @@ -3218,7 +3218,7 @@ IDCANCEL 閉じる(&X) PREFIX D_EM_ADD STATIC1 キャプチャに使用する LAN カード名(&L): -R_PROMISCUS キャプチャの際にプロミスキャスモードを使用しない(&N) +R_PROMISCUOUS キャプチャの際にプロミスキャスモードを使用しない(&N) STATIC2 パケットログ(&P): S_PACKET ログファイルの切り替え周期(&W): S_PACKET_0 TCP コネクションログ: diff --git a/src/bin/hamcore/strtable_ko.stb b/src/bin/hamcore/strtable_ko.stb index 09e6731b..0de7fe2c 100644 --- a/src/bin/hamcore/strtable_ko.stb +++ b/src/bin/hamcore/strtable_ko.stb @@ -3214,7 +3214,7 @@ IDCANCEL 닫기 (&X) PREFIX D_EM_ADD STATIC1 캡처에 사용하는 LAN 카드 이름 (&L): -R_PROMISCUS 캡처로 인해 무차별 모드를 사용 안함 (&N) +R_PROMISCUOUS 캡처로 인해 무차별 모드를 사용 안함 (&N) STATIC2 패킷 로그 (&P): S_PACKET 로그 파일 전환주기 (&W): S_PACKET_0 TCP 연결 로그: diff --git a/src/bin/hamcore/strtable_tw.stb b/src/bin/hamcore/strtable_tw.stb index b11b85c3..95af380d 100644 --- a/src/bin/hamcore/strtable_tw.stb +++ b/src/bin/hamcore/strtable_tw.stb @@ -3230,7 +3230,7 @@ IDCANCEL 關閉(&X) PREFIX D_EM_ADD STATIC1 用於捕獲的網路介面卡名稱(&L): -R_PROMISCUS 捕獲時不要使用混雜模式(&N) +R_PROMISCUOUS 捕獲時不要使用混雜模式(&N) STATIC2 封包日誌 (&P) : S_PACKET 日誌檔切換週期 (&W) : S_PACKET_0 TCP 連接日誌: