3 files changed, 360 insertions, 36 deletions

diff --git a/src/config/parameters/handle_remote_client_commands.c b/src/config/parameters/handle_remote_client_commands.c
index 5523e37..caa82dc 100644
--- a/src/config/parameters/handle_remote_client_commands.c
+++ b/src/config/parameters/handle_remote_client_commands.c
@@ -58,6 +58,10 @@ static int get_next_argument
       return -1;
    }
 
+   /*
+    * size is "not including the terminating null byte", so it's the '\n'
+    * character.
+    */
    input->buffer[(input->size - 1)] = '\0';
 
    return 0;
@@ -89,7 +93,7 @@ static void finalize_client_input
 static int handle_timeout_change
 (
    struct relabsd_parameters_client_input input [const restrict static 1],
-   struct relabsd_parameters parameters [const static 1]
+   struct relabsd_parameters parameters [const restrict static 1]
 )
 {
    int timeout_msec;
@@ -113,12 +117,281 @@ static int handle_timeout_change
    return 0;
 }
 
-static int handle_inputs
+static int handle_name_change
+(
+   struct relabsd_parameters_client_input input [const restrict static 1],
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   const char * device_name;
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR("Could not get device name value from client.");
+
+      return -1;
+   }
+
+   device_name =
+      (const char *) calloc((size_t) (input->size - 1), sizeof(char));
+
+   if (device_name == (const char *) NULL)
+   {
+      RELABSD_S_ERROR
+      (
+         "Could not allocate memory to store the device name requested by"
+         " the client."
+      );
+
+      return -1;
+   }
+
+   (void) memcpy
+   (
+      (void *) device_name,
+      (const void *) input->buffer,
+      (size_t) (input->size - 1)
+   );
+
+   if (parameters->device_name_was_modified)
+   {
+      free((void *) parameters->device_name);
+   }
+
+   parameters->device_name = device_name;
+   parameters->device_name_was_modified = 1;
+
+   return 0;
+}
+
+static int handle_axis_mod
 (
    struct relabsd_parameters_client_input input [const restrict static 1],
    struct relabsd_parameters parameters [const static 1]
 )
 {
+   enum relabsd_axis_name axis_name;
+   int * value_to_modify;
+   int min_value;
+   int input_value;
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR("Could not get name of axis to modify from client.");
+
+      return -1;
+   }
+
+   axis_name = relabsd_axis_parse_name(input->buffer);
+
+   if (axis_name == RELABSD_UNKNOWN)
+   {
+      RELABSD_ERROR
+      (
+         "Client requested modification on unknown axis \"%s\".",
+         input->buffer
+      );
+
+      return -1;
+   }
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR("Could not get parameter of axis to modify from client.");
+
+      return -1;
+   }
+
+   if (RELABSD_STRING_EQUALS("min", input->buffer))
+   {
+      value_to_modify = &(parameters->axes[axis_name].min);
+      min_value = INT_MIN;
+   }
+   else if (RELABSD_STRING_EQUALS("max", input->buffer))
+   {
+      value_to_modify = &(parameters->axes[axis_name].max);
+      min_value = INT_MIN;
+   }
+   else if (RELABSD_STRING_EQUALS("fuzz", input->buffer))
+   {
+      value_to_modify = &(parameters->axes[axis_name].fuzz);
+      min_value = 0;
+   }
+   else if (RELABSD_STRING_EQUALS("flat", input->buffer))
+   {
+      value_to_modify = &(parameters->axes[axis_name].flat);
+      min_value = 0;
+   }
+   else if (RELABSD_STRING_EQUALS("resolution", input->buffer))
+   {
+      value_to_modify = &(parameters->axes[axis_name].resolution);
+      min_value = 0;
+   }
+   else
+   {
+      RELABSD_ERROR
+      (
+         "Client requested modification on unknown axis parameter \"%s\".",
+         input->buffer
+      );
+
+      return -1;
+   }
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR
+      (
+         "Could not get new value for axis modification requested by client."
+      );
+
+      return -1;
+   }
+
+   if
+   (
+      relabsd_util_parse_int
+      (
+         (input->buffer + 1),
+         min_value,
+         INT_MAX,
+         &input_value
+      )
+      < 0
+   )
+   {
+      RELABSD_ERROR
+      (
+         "Invalid value \"%s\"for axis modification requested by client.",
+         (input->buffer + 1)
+      );
+
+      return -1;
+   }
+
+   switch (input->buffer[0])
+   {
+      case '=':
+         *value_to_modify = input_value;
+         break;
+
+      case '-':
+         if (input_value == INT_MIN)
+         {
+            input_value = INT_MAX;
+         }
+         else
+         {
+            input_value = -input_value;
+         }
+         /* fall through */
+      case '+':
+         if
+         (
+            (
+               (input_value > 0)
+               && (*value_to_modify > (INT_MAX - input_value))
+            )
+            ||
+            (
+               (input_value < 0)
+               && (*value_to_modify < (min_value - input_value))
+            )
+         )
+         {
+            RELABSD_S_WARNING
+            (
+               "Client request would make axis parameter over/underflow."
+            );
+
+            *value_to_modify = (input_value < 0) ? min_value : INT_MAX;
+         }
+         else
+         {
+            *value_to_modify += input_value;
+         }
+         break;
+   }
+
+   parameters->axes[axis_name].previous_value = 0;
+   parameters->axes[axis_name].attributes_were_modified = 1;
+
+   return 0;
+}
+
+static int handle_option_toggle
+(
+   struct relabsd_parameters_client_input input [const restrict static 1],
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   enum relabsd_axis_name axis_name;
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR("Could not get name of axis to modify from client.");
+
+      return -1;
+   }
+
+   axis_name = relabsd_axis_parse_name(input->buffer);
+
+   if (axis_name == RELABSD_UNKNOWN)
+   {
+      RELABSD_ERROR
+      (
+         "Client requested modification on unknown axis \"%s\".",
+         input->buffer
+      );
+
+      return -1;
+   }
+
+   if (get_next_argument(input) < 0)
+   {
+      RELABSD_S_ERROR("Could not get option of axis to modify from client.");
+
+      return -1;
+   }
+
+   if (RELABSD_STRING_EQUALS("framed", input->buffer))
+   {
+      parameters->axes[axis_name].flags[RELABSD_FRAMED] ^= 1;
+   }
+   else if (RELABSD_STRING_EQUALS("direct", input->buffer))
+   {
+      parameters->axes[axis_name].flags[RELABSD_DIRECT] ^= 1;
+   }
+   else if (RELABSD_STRING_EQUALS("real_fuzz", input->buffer))
+   {
+      parameters->axes[axis_name].flags[RELABSD_REAL_FUZZ] ^= 1;
+   }
+   else if (RELABSD_STRING_EQUALS("enable", input->buffer))
+   {
+      parameters->axes[axis_name].is_enabled ^= 1;
+   }
+   else
+   {
+      RELABSD_ERROR
+      (
+         "Client requested toggle of unknown axis option \"%s\".",
+         input->buffer
+      );
+
+      return -1;
+   }
+
+   parameters->axes[axis_name].previous_value = 0;
+
+   return 0;
+}
+
+static int handle_inputs
+(
+   struct relabsd_parameters_client_input input [const restrict static 1],
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
    for (;;)
    {
       if (get_next_argument(input) < 0)
@@ -148,7 +421,7 @@ static int handle_inputs
       {
          if (handle_timeout_change(input, parameters) < 0)
          {
-            return 0;
+            return -1;
          }
       }
       else if
@@ -157,8 +430,10 @@ static int handle_inputs
          || RELABSD_STRING_EQUALS("--name", input->buffer)
       )
       {
-         /* TODO: implement */
-         RELABSD_PROG_ERROR("Unimplemented command \"%s\".", input->buffer);
+         if (handle_name_change(input, parameters) < 0)
+         {
+            return -1;
+         }
       }
       else if
       (
@@ -166,8 +441,21 @@ static int handle_inputs
          || RELABSD_STRING_EQUALS("--mod-axis", input->buffer)
       )
       {
-         /* TODO: implement */
-         RELABSD_PROG_ERROR("Unimplemented command \"%s\".", input->buffer);
+         if (handle_axis_mod(input, parameters) < 0)
+         {
+            return -1;
+         }
+      }
+      else if
+      (
+         RELABSD_STRING_EQUALS("-o", input->buffer)
+         || RELABSD_STRING_EQUALS("--toggle-option", input->buffer)
+      )
+      {
+         if (handle_option_toggle(input, parameters) < 0)
+         {
+            return -1;
+         }
       }
       else
       {
diff --git a/src/config/parameters/parameters.c b/src/config/parameters/parameters.c
index 84b348c..04ee498 100644
--- a/src/config/parameters/parameters.c
+++ b/src/config/parameters/parameters.c
@@ -315,6 +315,21 @@ int relabsd_parameters_parse_options
             return -1;
          }
       }
+      else if
+      (
+         RELABSD_STRING_EQUALS("-m", argv[i])
+         || RELABSD_STRING_EQUALS("--mod-axis", argv[i])
+         || RELABSD_STRING_EQUALS("-o", argv[i])
+         || RELABSD_STRING_EQUALS("--toggle-argv[i]", argv[i])
+         ||RELABSD_STRING_EQUALS("-q", argv[i])
+         || RELABSD_STRING_EQUALS("--quit", argv[i])
+      )
+      {
+         RELABSD_FATAL("\"%s\" is not available in this mode.", argv[i]);
+         relabsd_parameters_print_usage(argv[0]);
+
+         return -1;
+      }
       else
       {
          RELABSD_FATAL("Unknown <OPTION> \"%s\".", argv[i]);
@@ -361,14 +376,6 @@ int relabsd_parameters_argument_count_for
    }
    else if
    (
-      RELABSD_STRING_EQUALS("-a", option)
-      || RELABSD_STRING_EQUALS("--axis", option)
-   )
-   {
-      *result = 7;
-   }
-   else if
-   (
       RELABSD_STRING_EQUALS("-m", option)
       || RELABSD_STRING_EQUALS("--mod-axis", option)
    )
@@ -377,19 +384,24 @@ int relabsd_parameters_argument_count_for
    }
    else if
    (
-      RELABSD_STRING_EQUALS("-f", option)
-      || RELABSD_STRING_EQUALS("--config", option)
+      RELABSD_STRING_EQUALS("-o", option)
+      || RELABSD_STRING_EQUALS("--toggle-option", option)
    )
    {
-      *result = 1;
+      *result = 2;
    }
    else if
    (
-      RELABSD_STRING_EQUALS("-q", option)
-      || RELABSD_STRING_EQUALS("--quit", option)
+      RELABSD_STRING_EQUALS("-d", option)
+      || RELABSD_STRING_EQUALS("--daemon", option)
+      || RELABSD_STRING_EQUALS("-f", option)
+      || RELABSD_STRING_EQUALS("--config", option)
+      || RELABSD_STRING_EQUALS("-a", option)
+      || RELABSD_STRING_EQUALS("--axis", option)
    )
    {
-      *result = 0;
+      RELABSD_ERROR("\"%s\" is not available in this mode.", option);
+      relabsd_parameters_print_usage("relabsd");
    }
    else
    {
@@ -412,46 +424,48 @@ void relabsd_parameters_print_usage (const char exec [const restrict static 1])
          "\t\tDevice & configuration compatibility test.\n\n"
 
          "\t%s [-c | --client] <server_file> "
-            "[(<CLIENT_OPTION>|<GLOBAL_CONF_OPTION>)+]"
-         "\n"
+            "[(<CLIENT_OPTION>|<GLOBAL_CONF_OPTION>)+]\n"
          "\t\tSends the commands to a given server instance.\n\n"
 
          "\t%s [-s | --server] <server_file> <physical_device_file>"
-         " [(<SERVER_OPTION>|<CONF_OPTION>)+]:\n"
+         " [(<SERVER_OPTION>|<CONF_OPTION>)+]\n"
             "\t\tCreates a named server instance.\n\n"
 
          "\t%s [-1 | --self] <physical_device_file>"
-         " [(<SERVER_OPTION>|<CONF_OPTION>)+]:\n"
+         " [(<SERVER_OPTION>|<CONF_OPTION>)+]\n"
             "\t\tCreates an unnamed server instance.\n\n"
 
       "<GLOBAL_CONF_OPTION>:\n"
-      "\t[-n | --name] <relabsd_device_name>:\n"
+      "\t[-n | --name] <relabsd_device_name>\n"
          "\t\tNames the virtual device.\n\n"
 
-      "\t[-t | --timeout] <timeout_in_ms>:\n"
+      "\t[-t | --timeout] <timeout_in_ms>\n"
          "\t\tSets a zeroing timeout (0 to disable).\n\n"
 
-      "\t[-m | --mod-axis] <name> [min|max|fuzz|flat|resolution|enable]"
-         " [+|-|=]<value>:\n"
-         "\t\tModifies an axis.\n\n"
-
       "<CONF_OPTION>:\n"
       "\t<GLOBAL_CONF_OPTION>\n\n"
 
       "\t[-a | --axis] <name> <min> <max> <fuzz> <flat> <resolution> "
-         "<options>:\n"
+         "<options>\n"
          "\t\t(Re)defines an axis.\n\n"
 
-      "\t[-f | --config] <config_file>"
+      "\t[-f | --config] <config_file>\n"
          "\t\tUse the options defined in <config_file>.\n\n"
 
       "<SERVER_OPTION>:\n"
-      "\t[-d | --daemon]:\n"
+      "\t[-d | --daemon]\n"
          "\t\tRuns server instance in the background.\n\n"
 
       "<CLIENT_OPTION>:\n"
-      "\t[-q | --quit]:\n"
-         "\t\tTerminates the targeted server instance.\n",
+      "\t[-q | --quit]\n"
+         "\t\tTerminates the targeted server instance.\n\n"
+
+      "\t[-m | --mod-axis] <axis_name> [min|max|fuzz|flat|resolution]"
+         " [+|-|=]<value>\n"
+         "\t\tModifies an axis.\n\n"
+
+      "\t[-o | --toggle-option] <axis_name> [direct|real_fuzz|framed|enable]\n"
+         "\t\tToggles an axis option.\n",
       exec,
       exec,
       exec,
diff --git a/src/config/parameters/parameters_accessors.c b/src/config/parameters/parameters_accessors.c
index f47ff63..2ce5b22 100644
--- a/src/config/parameters/parameters_accessors.c
+++ b/src/config/parameters/parameters_accessors.c
@@ -26,6 +26,7 @@ void relabsd_parameters_initialize_options
    parameters->device_name = (const char *) NULL;
    parameters->physical_device_file_name = (const char *) NULL;
    parameters->configuration_file = (const char *) NULL;
+   parameters->device_name_was_modified = 0;
 
    for (i = 0; i < RELABSD_AXIS_VALID_AXES_COUNT; ++i)
    {
@@ -125,3 +126,24 @@ struct timeval relabsd_parameters_get_timeout
 {
    return parameters->timeout;
 }
+
+int relabsd_parameters_device_name_is_dirty
+(
+   const struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   return parameters->device_name_was_modified;
+}
+
+void relabsd_parameters_clean_device_name
+(
+   struct relabsd_parameters parameters [const restrict static 1]
+)
+{
+   if (parameters->device_name_was_modified)
+   {
+      free((void *) parameters->device_name);
+      parameters->device_name = (const char *) NULL;
+      parameters->device_name_was_modified = 0;
+   }
+}