summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Decavel2009-09-16 15:50:24 +0200
committerBenjamin Decavel2009-09-16 15:50:24 +0200
commitd4563a844132147c769197de260e8613ccb9e8d2 (patch)
tree8bc39a1ad957bfed032ee1e7981d1c774b4b1772
parent77456000533ed083ac0f70fbb9ecad8d0aaf13e3 (diff)
spidlib: moved some keys and a path to the right files
-rw-r--r--application/spidlib/inc/config_keys.h8
-rw-r--r--application/spidlib/inc/network.h8
-rw-r--r--application/spidlib/src/network/traffic_limit.c8
3 files changed, 12 insertions, 12 deletions
diff --git a/application/spidlib/inc/config_keys.h b/application/spidlib/inc/config_keys.h
index 8d46e1e88e..06f5051a60 100644
--- a/application/spidlib/inc/config_keys.h
+++ b/application/spidlib/inc/config_keys.h
@@ -35,4 +35,12 @@
#define SPIDLIB_WHITELIST_ENABLE_KEY "WHITELIST"
+#define SPIDLIB_VLAN_ENABLE_KEY "VLAN_ENABLE"
+#define SPIDLIB_ID_LIMIT_ENABLE_KEY "ID_LIMITATION"
+#define SPIDLIB_SERVICE_TYPE_KEY "SERVICE_TYPE"
+#define SPIDLIB_MASTER_VLAN_ID_KEY "MASTER_VID"
+
+#define SPIDLIB_TRAFFIC_DOWNLOAD_KEY "TRAFFIC_DOWNLOAD"
+#define SPIDLIB_TRAFFIC_UPLOAD_KEY "TRAFFIC_UPLOAD"
+
#endif
diff --git a/application/spidlib/inc/network.h b/application/spidlib/inc/network.h
index 50ecc7ee92..051c35d1f6 100644
--- a/application/spidlib/inc/network.h
+++ b/application/spidlib/inc/network.h
@@ -32,9 +32,6 @@
|| !strcmp(iface, SPIDLIB_INTERFACE_PLC0) \
|| !strcmp(iface, SPIDLIB_INTERFACE_ETH0))
-#define SPIDLIB_NETWORK_CONFIG_FILE "/etc/config/network"
-#define TRAFFIC_DOWNLOAD_KEY "TRAFFIC_DOWNLOAD"
-#define TRAFFIC_UPLOAD_KEY "TRAFFIC_UPLOAD"
#define TRAFFIC_LATENCY "100ms "
#define HZ 100
@@ -52,11 +49,6 @@
#define ID_SIZE 8
#define ACTION_SIZE 2
-#define SPIDLIB_VLAN_ENABLE_KEY "VLAN_ENABLE"
-#define SPIDLIB_ID_LIMIT_ENABLE_KEY "ID_LIMITATION"
-#define SPIDLIB_SERVICE_TYPE_KEY "SERVICE_TYPE"
-#define SPIDLIB_MASTER_VLAN_ID_KEY "MASTER_VID"
-
/* ----- Services -----*/
#define SPIDLIB_SERVICE_INDEX_MIN 0
#define SPIDLIB_SERVICE_INDEX_MAX 255
diff --git a/application/spidlib/src/network/traffic_limit.c b/application/spidlib/src/network/traffic_limit.c
index 06f7f04a36..567f0cb1f2 100644
--- a/application/spidlib/src/network/traffic_limit.c
+++ b/application/spidlib/src/network/traffic_limit.c
@@ -58,7 +58,7 @@ int spidlib_get_traffic_limit(spidlib_direction_t direction, unsigned int* value
// Read parameter into network config file depends on wanted direction : Download or Upload
if (direction == DOWNLOAD)
{
- ret = spidlib_read_config_param(SPIDLIB_NETWORK_CONFIG_FILE, TRAFFIC_DOWNLOAD_KEY, get_value, sizeof(get_value));
+ ret = spidlib_read_config_param(SPIDLIB_NETWORK_CONFIG_PATH, SPIDLIB_TRAFFIC_DOWNLOAD_KEY, get_value, sizeof(get_value));
if (ret != 0)
{
errno = ENOENT;
@@ -68,7 +68,7 @@ int spidlib_get_traffic_limit(spidlib_direction_t direction, unsigned int* value
}
else
{
- ret = spidlib_read_config_param(SPIDLIB_NETWORK_CONFIG_FILE, TRAFFIC_UPLOAD_KEY, get_value, sizeof(get_value));
+ ret = spidlib_read_config_param(SPIDLIB_NETWORK_CONFIG_PATH, SPIDLIB_TRAFFIC_UPLOAD_KEY, get_value, sizeof(get_value));
if (ret != 0)
{
errno = ENOENT;
@@ -105,11 +105,11 @@ int spidlib_set_traffic_limit(spidlib_direction_t direction, unsigned int limit_
// Write parameter into network config file depends on wanted direction : Download or Upload
if (direction == DOWNLOAD)
{
- return spidlib_write_config_param(SPIDLIB_NETWORK_CONFIG_FILE, TRAFFIC_DOWNLOAD_KEY, buffer_value);
+ return spidlib_write_config_param(SPIDLIB_NETWORK_CONFIG_PATH, SPIDLIB_TRAFFIC_DOWNLOAD_KEY, buffer_value);
}
else
{
- return spidlib_write_config_param(SPIDLIB_NETWORK_CONFIG_FILE, TRAFFIC_UPLOAD_KEY, buffer_value);
+ return spidlib_write_config_param(SPIDLIB_NETWORK_CONFIG_PATH, SPIDLIB_TRAFFIC_UPLOAD_KEY, buffer_value);
}
}