|
From: <nor...@us...> - 2007-05-16 22:08:51
|
Revision: 41
http://opencalea.svn.sourceforge.net/opencalea/?rev=41&view=rev
Author: norm_brandinger
Date: 2007-05-16 15:08:53 -0700 (Wed, 16 May 2007)
Log Message:
-----------
Updates to opencalea to put config files related to different programs (df_collector, controllerd, tap) in different Config structures.
Modified Paths:
--------------
trunk/src/opencalea.c
Modified: trunk/src/opencalea.c
===================================================================
--- trunk/src/opencalea.c 2007-05-16 21:42:37 UTC (rev 40)
+++ trunk/src/opencalea.c 2007-05-16 22:08:53 UTC (rev 41)
@@ -32,6 +32,10 @@
int read_config_file(int level, char *arg);
Config config_intercept;
+Config config_df_collector;
+Config config_lea_collector;
+Config config_controllerd;
+Config config_tap;
/**
* Main Routine
@@ -154,28 +158,28 @@
case STATE_STOP_DF_COLLECTOR_FILE:
case STATE_STATUS_DF_COLLECTOR_FILE:
strcpy(file_df_collector, arg);
- if (parse_config(&config_intercept, "DF_COLLECTOR", local_path) < 0)
+ if (parse_config(&config_df_collector, "DF_COLLECTOR", local_path) < 0)
die("Error with config file \"%s\"", local_path);
break;
case STATE_START_CONTROLLERD_FILE:
case STATE_STOP_CONTROLLERD_FILE:
case STATE_STATUS_CONTROLLERD_FILE:
strcpy(file_controllerd, arg);
- if (parse_config(&config_intercept, "CONTROLLERD", local_path) < 0)
+ if (parse_config(&config_controllerd, "CONTROLLERD", local_path) < 0)
die("Error with config file \"%s\"", local_path);
break;
case STATE_START_LEA_COLLECTOR_FILE:
case STATE_STOP_LEA_COLLECTOR_FILE:
case STATE_STATUS_LEA_COLLECTOR_FILE:
strcpy(file_lea_collector, arg);
- if (parse_config(&config_intercept, "LEA_COLLECTOR", local_path) < 0)
+ if (parse_config(&config_lea_collector, "LEA_COLLECTOR", local_path) < 0)
die("Error with config file \"%s\"", local_path);
break;
case STATE_START_TAP_FILE:
case STATE_STOP_TAP_FILE:
case STATE_STATUS_TAP_FILE:
strcpy(file_tap, arg);
- if (parse_config(&config_intercept, "TAP", local_path) < 0)
+ if (parse_config(&config_tap, "TAP", local_path) < 0)
die("Error with config file \"%s\"", local_path);
break;
default:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|