accept command line lauching options.

example: --filter "outbund" --lag on --lag-time 5000; no docs yet.

Author: jagt

src/common.h

@@ -16,6 +16,10 @@
 #define INTEGER_MAX "__INTEGER_MAX"
 #define INTEGER_MIN "__INTEGER_MIN"
 
+// workaround stupid vs2012 runtime check.
+// it would show even when seeing explicit "(short)(i);"
+#define I2S(x) ((short)((x) & 0xFFFF))
+
 
 #ifdef __MINGW32__
 #define INLINE_FUNCTION __inline__
@@ -87,7 +91,8 @@ typedef struct {
     /*
      * Static module data
      */
-    const char *name; // name of the module
+    const char *displayName; // display name shown in ui
+    const char *shortName; // single word name
     short *enabledFlag; // volatile short flag to determine enabled or not
     Ihandle* (*setupUIFunc)(); // return hbox as controls group
     void (*startUp)(); // called when starting up the module
@@ -150,7 +155,13 @@ void endTimePeriod();
 // elevate
 BOOL IsElevated();
 BOOL IsRunAsAdmin();
-BOOL tryElevate(HWND hWnd);
+BOOL tryElevate(HWND hWnd, BOOL silent);
 
 // icons
-extern const unsigned char icon8x8[8*8];
+extern const unsigned char icon8x8[8*8];
+
+// parameterized
+extern BOOL parameterized;
+void setFromParameter(Ihandle *ih, const char *field, const char *key);
+BOOL parseArgs(int argc, char* argv[]);
+

src/drop.c

@@ -3,6 +3,7 @@
 #include <Windows.h>
 #include "iup.h"
 #include "common.h"
+#define NAME "drop"
 
 static Ihandle *inboundCheckbox, *outboundCheckbox, *chanceInput;
 
@@ -33,6 +34,12 @@ static Ihandle* dropSetupUI() {
     IupSetAttribute(inboundCheckbox, "VALUE", "ON");
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(chanceInput, "VALUE", NAME"-chance");
+    }
+
     return dropControlsBox;
 }
 
@@ -68,6 +75,7 @@ static short dropProcess(PacketNode *head, PacketNode* tail) {
 
 Module dropModule = {
     "Drop",
+    NAME,
     (short*)&dropEnabled,
     dropSetupUI,
     dropStartUp,

src/duplicate.c

@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include "iup.h"
 #include "common.h"
+#define NAME "duplicate"
 #define COPIES_MIN "2"
 #define COPIES_MAX "50"
 #define COPIES_COUNT 2
@@ -44,6 +45,13 @@ static Ihandle* dupSetupUI() {
     IupSetAttribute(inboundCheckbox, "VALUE", "ON");
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(chanceInput, "VALUE", NAME"-chance");
+        setFromParameter(countInput, "VALUE", NAME"-count");
+    }
+
     return dupControlsBox;
 }
 
@@ -78,6 +86,7 @@ static short dupProcess(PacketNode *head, PacketNode *tail) {
 
 Module dupModule = {
     "Duplicate",
+    NAME,
     (short*)&dupEnabled,
     dupSetupUI,
     dupStartup,

src/elevate.c

@@ -98,25 +98,29 @@ BOOL IsElevated( ) {
 }
 
 // try elevate and error out when can't happen
+// is silent then no message boxes are shown
 // return whether to close the program
-BOOL tryElevate(HWND hWnd) {
+BOOL tryElevate(HWND hWnd, BOOL silent) {
     // Check the current process's "run as administrator" status.
     BOOL fIsRunAsAdmin;
     OSVERSIONINFO osver = {sizeof(osver)}; // MUST initialize with the size or GetVersionEx fails
     if (!GetVersionEx(&osver)) {
-        MessageBox(hWnd, (LPCSTR)"Failed to get os version. clumsy only supports Windows Vista or above.",
+        if (!silent) MessageBox(hWnd, (LPCSTR)"Failed to get os version. clumsy only supports Windows Vista or above.",
             (LPCSTR)"Aborting", MB_OK);
         return TRUE;
     } else if (osver.dwMajorVersion < 6) {
-        MessageBox(hWnd, (LPCSTR)"Unsupported Windows version. clumsy only supports Windows Vista or above.",
+        if (!silent) MessageBox(hWnd, (LPCSTR)"Unsupported Windows version. clumsy only supports Windows Vista or above.",
             (LPCSTR)"Aborting", MB_OK);
         return TRUE;
     }
 
     fIsRunAsAdmin = IsRunAsAdmin();
     if (fIsRunAsAdmin) {
         return FALSE;
-    } else {
+    }
+
+    // when not silent then trying to reinvoke to elevate
+    if (!silent) {
         wchar_t szPath[MAX_PATH];
         if (GetModuleFileName(NULL, (LPSTR)szPath, ARRAYSIZE(szPath)))
         {
@@ -145,8 +149,8 @@ BOOL tryElevate(HWND hWnd) {
             MessageBox(hWnd, (LPCSTR)"Failed to get clumsy path. Please place the executable in a normal directory.",
                 (LPCSTR)"Aborting", MB_OK);
         }
-
-        // exit when not run as admin
-        return TRUE;
     }
+
+    // exit when not run as admin
+    return TRUE;
 }

src/lag.c

@@ -1,6 +1,7 @@
 // lagging packets
 #include "iup.h"
 #include "common.h"
+#define NAME "lag"
 #define LAG_MIN "0"
 #define LAG_MAX "3000"
 #define KEEP_AT_MOST 2000
@@ -50,6 +51,12 @@ static Ihandle *lagSetupUI() {
     IupSetAttribute(inboundCheckbox, "VALUE", "ON");
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(timeInput, "VALUE", NAME"-time");
+    }
+
     return lagControlsBox;
 }
 
@@ -117,6 +124,7 @@ static short lagProcess(PacketNode *head, PacketNode *tail) {
 
 Module lagModule = {
     "Lag",
+    NAME,
     (short*)&lagEnabled,
     lagSetupUI,
     lagStartUp,

src/main.c

@@ -48,6 +48,7 @@ typedef struct {
 UINT filtersSize;
 filterRecord filters[CONFIG_MAX_RECORDS] = {0};
 char configBuf[CONFIG_BUF_SIZE+2]; // add some padding to write \n
+BOOL parameterized = 0; // parameterized flag, means reading args from command line
 
 // loading up filters and fill in
 void loadConfig() {
@@ -147,6 +148,18 @@ void init(int argc, char* argv[]) {
         )
     );
 
+    // parse arguments and set globals *before* setting up UI.
+    // arguments can be read and set after callbacks are setup
+    // FIXME as Release is built as WindowedApp, stdout/stderr won't show
+    LOG("argc: %d", argc);
+    if (argc > 1) {
+        if (!parseArgs(argc, argv)) {
+            fprintf(stderr, "invalid argument count. ensure you're using options as \"--drop on\"");
+            exit(-1); // fail fast.
+        }
+        parameterized = 1;
+    }
+
     IupSetAttribute(topFrame, "TITLE", "Filtering");
     IupSetAttribute(topFrame, "EXPAND", "HORIZONTAL");
     IupSetAttribute(filterText, "EXPAND", "HORIZONTAL");
@@ -228,6 +241,7 @@ void init(int argc, char* argv[]) {
     timer = IupTimer();
     IupSetAttribute(timer, "TIME", STR(ICON_UPDATE_MS));
     IupSetCallback(timer, "ACTION_CB", uiTimerCb);
+
 }
 
 void startup() {
@@ -267,7 +281,13 @@ static int uiOnDialogShow(Ihandle *ih, int state) {
     SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon);
 
     // try elevate and decides whether to exit
-    exit = tryElevate(hWnd);
+    exit = tryElevate(hWnd, parameterized);
+    if (!exit && parameterized) {
+        setFromParameter(filterText, "VALUE", "filter");
+        LOG("is parameterized, start filtering upon execution.");
+        uiStartCb(filterButton);
+    }
+
     return exit ? IUP_CLOSE : IUP_DEFAULT;
 }
 
@@ -322,10 +342,10 @@ static int uiToggleControls(Ihandle *ih, int state) {
     int controlsActive = IupGetInt(controls, "ACTIVE");
     if (controlsActive && !state) {
         IupSetAttribute(controls, "ACTIVE", "NO");
-        InterlockedExchange16(target, (short)state);
+        InterlockedExchange16(target, I2S(state));
     } else if (!controlsActive && state) {
         IupSetAttribute(controls, "ACTIVE", "YES");
-        InterlockedExchange16(target, (short)state);
+        InterlockedExchange16(target, I2S(state));
     }
 
     return IUP_DEFAULT;
@@ -382,7 +402,7 @@ static void uiSetupModule(Module *module, Ihandle *parent) {
     Ihandle *groupBox, *toggle, *controls, *icon;
     groupBox = IupHbox(
         icon = IupLabel(NULL),
-        toggle = IupToggle(module->name, NULL),
+        toggle = IupToggle(module->displayName, NULL),
         IupFill(),
         controls = module->setupUIFunc(),
         NULL
@@ -403,6 +423,11 @@ static void uiSetupModule(Module *module, Ihandle *parent) {
     IupSetAttribute(icon, "IMAGE", "none_icon");
     IupSetAttribute(icon, "PADDING", "4x");
     module->iconHandle = icon;
+
+    // parameterize toggle
+    if (parameterized) {
+        setFromParameter(toggle, "VALUE", module->shortName);
+    }
 }
 
 int main(int argc, char* argv[]) {

src/ood.c

@@ -1,6 +1,7 @@
 // out of order arrange packets module
 #include "iup.h"
 #include "common.h"
+#define NAME "ood"
 // keep a picked packet at most for KEEP_TURNS_MAX steps, or if there's no following
 // one it would just to be sended
 #define KEEP_TURNS_MAX 10 
@@ -35,6 +36,12 @@ static Ihandle *oodSetupUI() {
     IupSetAttribute(inboundCheckbox, "VALUE", "ON");
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(chanceInput, "VALUE", NAME"-chance");
+    }
+
     return oodControlsBox;
 }
 
@@ -134,6 +141,7 @@ static short oodProcess(PacketNode *head, PacketNode *tail) {
 
 Module oodModule = {
     "Out of order",
+    NAME,
     (short*)&oodEnabled,
     oodSetupUI,
     oodStartUp,

src/tamper.c

@@ -2,6 +2,7 @@
 #include "iup.h"
 #include "windivert.h"
 #include "common.h"
+#define NAME "tamper"
 
 static Ihandle *inboundCheckbox, *outboundCheckbox, *chanceInput, *checksumCheckbox;
 
@@ -38,6 +39,13 @@ static Ihandle* tamperSetupUI() {
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
     IupSetAttribute(checksumCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(chanceInput, "VALUE", NAME"-chance");
+        setFromParameter(checksumCheckbox, "VALUE", NAME"-checksum");
+    }
+
     return dupControlsBox;
 }
 
@@ -114,6 +122,7 @@ static short tamperProcess(PacketNode *head, PacketNode *tail) {
 
 Module tamperModule = {
     "Tamper",
+    NAME,
     (short*)&tamperEnabled,
     tamperSetupUI,
     tamperStartup,

src/throttle.c

@@ -1,6 +1,7 @@
 // throttling packets
 #include "iup.h"
 #include "common.h"
+#define NAME "throttle"
 #define TIME_MIN "0"
 #define TIME_MAX "1000"
 #define TIME_DEFAULT 30
@@ -58,6 +59,13 @@ static Ihandle *throttleSetupUI() {
     IupSetAttribute(inboundCheckbox, "VALUE", "ON");
     IupSetAttribute(outboundCheckbox, "VALUE", "ON");
 
+    if (parameterized) {
+        setFromParameter(inboundCheckbox, "VALUE", NAME"-inbound");
+        setFromParameter(outboundCheckbox, "VALUE", NAME"-outbound");
+        setFromParameter(chanceInput, "VALUE", NAME"-chance");
+        setFromParameter(frameInput, "VALUE", NAME"-frame");
+    }
+
     return throttleControlsBox;
 }
 
@@ -129,6 +137,7 @@ static short throttleProcess(PacketNode *head, PacketNode *tail) {
 
 Module throttleModule = {
     "Throttle",
+    NAME,
     (short*)&throttleEnabled,
     throttleSetupUI,
     throttleStartUp,