summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorYacine Belkadi2011-01-06 18:19:13 +0100
committerYacine Belkadi2011-01-18 17:38:13 +0100
commit6cf3caf30e73b5eb327a5fed43a4f47ae8b61129 (patch)
tree79950156951a75cbd978b1128c970cb00c360dcd /cleopatre
parente395b5fd501aa170f470f526f8ab9847c656a652 (diff)
cleo/app/cwmp: prefix ("utils_") functions and types provided by utils.c
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/application/cwmp/inc/utils.h15
-rw-r--r--cleopatre/application/cwmp/src/impl_get.c58
-rw-r--r--cleopatre/application/cwmp/src/impl_set.c2
-rw-r--r--cleopatre/application/cwmp/src/utils.c34
4 files changed, 57 insertions, 52 deletions
diff --git a/cleopatre/application/cwmp/inc/utils.h b/cleopatre/application/cwmp/inc/utils.h
index 779a09d980..672bbeec3f 100644
--- a/cleopatre/application/cwmp/inc/utils.h
+++ b/cleopatre/application/cwmp/inc/utils.h
@@ -31,7 +31,12 @@
#define OUI_SIZE (6 + 1)
-struct network_interface_stats
+typedef enum {
+ UTILS_STATUS_OK = 0,
+ UTILS_STATUS_ERROR = 1
+} utils_status_t;
+
+struct utils_net_if_stats
{
unsigned long rx_packets;
unsigned long tx_packets;
@@ -41,9 +46,9 @@ struct network_interface_stats
unsigned long tx_errors;
};
-int run_command(const char *command);
-impl_status_t get_network_interface_stats(const char *network_interface_name, struct network_interface_stats *stats);
-impl_status_t get_oui(char *buffer, int buffer_size);
-impl_status_t get_software_version(char *buffer, int buffer_size);
+int utils_run_command(const char *command);
+utils_status_t utils_get_network_interface_stats(const char *network_interface_name, struct utils_net_if_stats *stats);
+utils_status_t utils_get_oui(char *buffer, int buffer_size);
+utils_status_t utils_get_software_version(char *buffer, int buffer_size);
#endif /* UTILS_H */
diff --git a/cleopatre/application/cwmp/src/impl_get.c b/cleopatre/application/cwmp/src/impl_get.c
index 907a0c8066..941e79eea3 100644
--- a/cleopatre/application/cwmp/src/impl_get.c
+++ b/cleopatre/application/cwmp/src/impl_get.c
@@ -35,10 +35,10 @@ static char impl_device_deviceinfo_softwareversion[CWMP_PARAM_SIZE_DEVICE_DEVICE
static spc300_nvram_t cached_nvram; /* cache until the app ends. */
static spc300_nvram_t *nvram;
-static struct network_interface_stats cached_ethernet_if_stats; /* cache for one session */
-static struct network_interface_stats *ethernet_if_stats;
-static struct network_interface_stats cached_homeplug_if_stats; /* cache for one session */
-static struct network_interface_stats *homeplug_if_stats;
+static struct utils_net_if_stats cached_ethernet_if_stats; /* cache for one session */
+static struct utils_net_if_stats *ethernet_if_stats;
+static struct utils_net_if_stats cached_homeplug_if_stats; /* cache for one session */
+static struct utils_net_if_stats *homeplug_if_stats;
impl_status_t
cache_nvram(void)
@@ -71,12 +71,12 @@ cache_network_interfaces_stats(void)
}
/* The purpose of this function is to get the stats only once per session */
-static struct network_interface_stats *
+static struct utils_net_if_stats *
get_homeplug_if_stats()
{
if (homeplug_if_stats == NULL)
{
- if(get_network_interface_stats(HOMEPLUG_INTERFACE_NAME, &cached_homeplug_if_stats) == IMPL_STATUS_OK)
+ if(utils_get_network_interface_stats(HOMEPLUG_INTERFACE_NAME, &cached_homeplug_if_stats) == UTILS_STATUS_OK)
{
homeplug_if_stats = &cached_homeplug_if_stats;
}
@@ -89,12 +89,12 @@ get_homeplug_if_stats()
return homeplug_if_stats;
}
-static struct network_interface_stats *
+static struct utils_net_if_stats *
get_ethernet_if_stats()
{
if (ethernet_if_stats == NULL)
{
- if(get_network_interface_stats(ETHERNET_INTERFACE_NAME, &cached_ethernet_if_stats) == IMPL_STATUS_OK)
+ if(utils_get_network_interface_stats(ETHERNET_INTERFACE_NAME, &cached_ethernet_if_stats) == UTILS_STATUS_OK)
{
ethernet_if_stats = &cached_ethernet_if_stats;
}
@@ -176,12 +176,12 @@ impl_get_device_deviceinfo_manufactureroui(char *buffer, int buffer_size)
{
if (strlen(impl_device_deviceinfo_manufactureroui) == 0)
{
- impl_status_t status = get_oui(impl_device_deviceinfo_manufactureroui,
- CWMP_PARAM_SIZE_DEVICE_DEVICEINFO_MANUFACTUREROUI);
- if (status != IMPL_STATUS_OK)
+ utils_status_t status = utils_get_oui(impl_device_deviceinfo_manufactureroui,
+ CWMP_PARAM_SIZE_DEVICE_DEVICEINFO_MANUFACTUREROUI);
+ if (status != UTILS_STATUS_OK)
{
- log_error("...");
- return status;
+ log_error("error: %d", status);
+ return IMPL_STATUS_ERROR;
}
}
@@ -244,11 +244,11 @@ impl_get_device_deviceinfo_softwareversion(char *buffer, int buffer_size)
{
if(strlen(impl_device_deviceinfo_softwareversion) == 0)
{
- impl_status_t status = get_software_version(impl_device_deviceinfo_softwareversion,
- sizeof(impl_device_deviceinfo_softwareversion));
- if (status != IMPL_STATUS_OK)
+ utils_status_t status = utils_get_software_version(impl_device_deviceinfo_softwareversion,
+ sizeof(impl_device_deviceinfo_softwareversion));
+ if (status != UTILS_STATUS_OK)
{
- log_error("...");
+ log_error("error: %d", status);
return status;
}
}
@@ -378,7 +378,7 @@ impl_get_device_ethernet_interface_i_name(unsigned int instance_number, char *bu
impl_status_t
impl_get_device_ethernet_interface_i_stats_bytesreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -394,7 +394,7 @@ impl_get_device_ethernet_interface_i_stats_bytesreceived(unsigned int instance_n
impl_status_t
impl_get_device_ethernet_interface_i_stats_bytessent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -410,7 +410,7 @@ impl_get_device_ethernet_interface_i_stats_bytessent(unsigned int instance_numbe
impl_status_t
impl_get_device_ethernet_interface_i_stats_errorsreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -426,7 +426,7 @@ impl_get_device_ethernet_interface_i_stats_errorsreceived(unsigned int instance_
impl_status_t
impl_get_device_ethernet_interface_i_stats_errorssent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -442,7 +442,7 @@ impl_get_device_ethernet_interface_i_stats_errorssent(unsigned int instance_numb
impl_status_t
impl_get_device_ethernet_interface_i_stats_packetsreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -458,7 +458,7 @@ impl_get_device_ethernet_interface_i_stats_packetsreceived(unsigned int instance
impl_status_t
impl_get_device_ethernet_interface_i_stats_packetssent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_ethernet_if_stats();
+ struct utils_net_if_stats *stats = get_ethernet_if_stats();
if(stats != NULL)
{
@@ -507,7 +507,7 @@ impl_get_device_homeplug_interface_i_name(unsigned int instance_number, char *bu
impl_status_t
impl_get_device_homeplug_interface_i_stats_bytesreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
@@ -523,7 +523,7 @@ impl_get_device_homeplug_interface_i_stats_bytesreceived(unsigned int instance_n
impl_status_t
impl_get_device_homeplug_interface_i_stats_bytessent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
@@ -539,7 +539,7 @@ impl_get_device_homeplug_interface_i_stats_bytessent(unsigned int instance_numbe
impl_status_t
impl_get_device_homeplug_interface_i_stats_errorsreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
@@ -555,7 +555,7 @@ impl_get_device_homeplug_interface_i_stats_errorsreceived(unsigned int instance_
impl_status_t
impl_get_device_homeplug_interface_i_stats_errorssent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
@@ -571,7 +571,7 @@ impl_get_device_homeplug_interface_i_stats_errorssent(unsigned int instance_numb
impl_status_t
impl_get_device_homeplug_interface_i_stats_packetsreceived(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
@@ -587,7 +587,7 @@ impl_get_device_homeplug_interface_i_stats_packetsreceived(unsigned int instance
impl_status_t
impl_get_device_homeplug_interface_i_stats_packetssent(unsigned int instance_number, unsigned long *value)
{
- struct network_interface_stats *stats = get_homeplug_if_stats();
+ struct utils_net_if_stats *stats = get_homeplug_if_stats();
if(stats != NULL)
{
diff --git a/cleopatre/application/cwmp/src/impl_set.c b/cleopatre/application/cwmp/src/impl_set.c
index 7b5197457b..9b5c78edc7 100644
--- a/cleopatre/application/cwmp/src/impl_set.c
+++ b/cleopatre/application/cwmp/src/impl_set.c
@@ -79,7 +79,7 @@ complete_set_device_homeplug_interface_i_networkpassword(struct pending_device_h
pending_data->instance_number = NULL_INSTANCE_NUMBER;
log_debug("Calling spidapp...");
- int status = run_command(command);
+ int status = utils_run_command(command);
if (status == -1)
{
log_error("...");
diff --git a/cleopatre/application/cwmp/src/utils.c b/cleopatre/application/cwmp/src/utils.c
index 5d9ae4af0c..f34662496b 100644
--- a/cleopatre/application/cwmp/src/utils.c
+++ b/cleopatre/application/cwmp/src/utils.c
@@ -14,7 +14,7 @@
#define PROC_NET_DEV_LINE_BUFFER_SIZE 512
int
-run_command(const char *command)
+utils_run_command(const char *command)
{
/* TODO: IMPORTANT! replace system() by execvp() */
@@ -28,17 +28,17 @@ run_command(const char *command)
return status;
}
-impl_status_t
-get_network_interface_stats(const char *network_interface_name, struct network_interface_stats *stats)
+utils_status_t
+utils_get_network_interface_stats(const char *network_interface_name, struct utils_net_if_stats *stats)
{
- impl_status_t status = IMPL_STATUS_ERROR;
+ utils_status_t status = UTILS_STATUS_ERROR;
errno = 0;
FILE *fp = fopen(PROC_NET_DEV, "r");
if(fp == NULL)
{
log_error("unable to open " PROC_NET_DEV " errno=%d", errno);
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
char buffer[PROC_NET_DEV_LINE_BUFFER_SIZE];
@@ -112,15 +112,15 @@ get_network_interface_stats(const char *network_interface_name, struct network_i
goto out;
}
- status = IMPL_STATUS_OK;
+ status = UTILS_STATUS_OK;
out:
fclose(fp);
return status;
}
-impl_status_t
-get_software_version(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
+utils_status_t
+utils_get_software_version(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
{
errno = 0;
struct utsname uname_data;
@@ -128,7 +128,7 @@ get_software_version(char *buffer, int buffer_size) /* TODO: Move to libspid ? *
if (ret == -1)
{
log_error("unable to retrieve uname. errno = %d", ret);
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
/* the software version is between parentheses in the uname.version string */
@@ -138,28 +138,28 @@ get_software_version(char *buffer, int buffer_size) /* TODO: Move to libspid ? *
|| (closing_par = strchr(uname_data.version, ')')) == NULL)
{
log_error("unexpected result while parsing uname version");
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
int len = closing_par - opening_par - 1;
if (len >= buffer_size)
{
log_error("buffer too small");
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
strncpy(buffer, opening_par + 1, len);
buffer[len + 1] = '\0';
- return IMPL_STATUS_OK;
+ return UTILS_STATUS_OK;
}
-impl_status_t
-get_oui(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
+utils_status_t
+utils_get_oui(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
{
if (buffer_size < OUI_SIZE)
{
log_error("buffer too small");
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
spc300_nvram_t nvram;
@@ -167,10 +167,10 @@ get_oui(char *buffer, int buffer_size) /* TODO: Move to libspid ? */
if (status != LIBSPID_SUCCESS)
{
log_error("unable to retrieve nvram. libspid returned %d", status);
- return IMPL_STATUS_ERROR;
+ return UTILS_STATUS_ERROR;
}
sprintf(buffer, "%.2X%.2X%.2X", nvram.plc_address[0], nvram.plc_address[1], nvram.plc_address[2]);
- return IMPL_STATUS_OK;
+ return UTILS_STATUS_OK;
}