if BUILD_WITH_LIBSOCKET
librouteros_la_LIBADD += -lsocket
endif
-librouteros_la_SOURCES = main.c registration_table.c interface.c routeros_api.h routeros_version.h
+librouteros_la_SOURCES = main.c routeros_api.h routeros_version.h \
+ ros_parse.c ros_parse.h \
+ registration_table.c \
+ interface.c
bin_PROGRAMS = ros
#include <assert.h>
#include "routeros_api.h"
+#include "ros_parse.h"
/*
* Private data types
*/
struct rt_internal_data_s
{
- ros_interface_handler handler;
+ ros_interface_handler_t handler;
void *user_data;
};
typedef struct rt_internal_data_s rt_internal_data_t;
/*
* Private functions
*/
-static unsigned int sstrtoui (const char *str) /* {{{ */
-{
- unsigned int ret;
- char *endptr;
-
- if (str == NULL)
- return (0);
-
- errno = 0;
- endptr = NULL;
- ret = (unsigned int) strtoul (str, &endptr, /* base = */ 10);
- if ((endptr == str) || (errno != 0))
- return (0);
-
- return (ret);
-} /* }}} unsigned int sstrtoui */
-
-static _Bool sstrtob (const char *str) /* {{{ */
-{
- if (str == NULL)
- return (false);
-
- if (strcasecmp ("true", str) == 0)
- return (true);
- return (false);
-} /* }}} _Bool sstrtob */
-
-static int string_to_rx_tx_counters (const char *str, /* {{{ */
- uint64_t *rx, uint64_t *tx)
-{
- const char *ptr;
- char *endptr;
-
- if ((rx == NULL) || (tx == NULL))
- return (EINVAL);
-
- *rx = 0;
- *tx = 0;
-
- if (str == NULL)
- return (EINVAL);
-
- ptr = str;
- errno = 0;
- endptr = NULL;
- *rx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
- if ((endptr == str) || (errno != 0))
- return (EIO);
-
- assert (endptr != NULL);
- if (*endptr != '/')
- return (EIO);
-
- ptr = endptr + 1;
- errno = 0;
- endptr = NULL;
- *tx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
- if ((endptr == str) || (errno != 0))
- return (EIO);
-
- return (0);
-} /* }}} int string_to_rx_tx_counters */
-
static ros_interface_t *rt_reply_to_interface (const ros_reply_t *r) /* {{{ */
{
ros_interface_t *ret;
ret->type = ros_reply_param_val_by_key (r, "type");
ret->comment = ros_reply_param_val_by_key (r, "comment");
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "packets"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "packets"),
&ret->rx_packets, &ret->tx_packets);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "bytes"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "bytes"),
&ret->rx_bytes, &ret->tx_bytes);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "errors"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "errors"),
&ret->rx_errors, &ret->tx_errors);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "drops"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "drops"),
&ret->rx_drops, &ret->tx_drops);
ret->mtu = sstrtoui (ros_reply_param_val_by_key (r, "mtu"));
return (ret);
} /* }}} ros_interface_t *rt_reply_to_interface */
-static void if_interface_free (ros_interface_t *r) /* {{{ */
+static void if_interface_free (const ros_interface_t *r) /* {{{ */
{
- ros_interface_t *next;
+ const ros_interface_t *next;
while (r != NULL)
{
next = r->next;
- free (r);
+ free ((void *) r);
r = next;
}
} /* }}} void if_interface_free */
* Public functions
*/
int ros_interface (ros_connection_t *c, /* {{{ */
- ros_interface_handler handler, void *user_data)
+ ros_interface_handler_t handler, void *user_data)
{
rt_internal_data_t data;
#include <assert.h>
#include "routeros_api.h"
+#include "ros_parse.h"
/*
Status: re
*/
struct rt_internal_data_s
{
- ros_registration_table_handler handler;
+ ros_registration_table_handler_t handler;
void *user_data;
};
typedef struct rt_internal_data_s rt_internal_data_t;
/*
* Private functions
*/
-static double sstrtod (const char *str) /* {{{ */
-{
- double ret;
- char *endptr;
-
- if (str == NULL)
- return (NAN);
-
- errno = 0;
- endptr = NULL;
- ret = strtod (str, &endptr);
- if ((endptr == str) || (errno != 0))
- return (NAN);
-
- return (ret);
-} /* }}} double sstrtod */
-
-static int string_to_rx_tx_counters (const char *str, /* {{{ */
- uint64_t *rx, uint64_t *tx)
-{
- const char *ptr;
- char *endptr;
-
- if ((str == NULL) || (rx == NULL) || (tx == NULL))
- return (EINVAL);
-
- ptr = str;
- errno = 0;
- endptr = NULL;
- *rx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
- if ((endptr == str) || (errno != 0))
- return (EIO);
-
- assert (endptr != NULL);
- if (*endptr != ',')
- return (EIO);
-
- ptr = endptr + 1;
- errno = 0;
- endptr = NULL;
- *tx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
- if ((endptr == str) || (errno != 0))
- return (EIO);
-
- return (0);
-} /* }}} int string_to_rx_tx_counters */
-
static ros_registration_table_t *rt_reply_to_regtable (const ros_reply_t *r) /* {{{ */
{
ros_registration_table_t *ret;
ret->rx_rate = sstrtod (ros_reply_param_val_by_key (r, "rx-rate"));
ret->tx_rate = sstrtod (ros_reply_param_val_by_key (r, "tx-rate"));
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "packets"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "packets"),
&ret->rx_packets, &ret->tx_packets);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "bytes"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "bytes"),
&ret->rx_bytes, &ret->tx_bytes);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "frames"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "frames"),
&ret->rx_frames, &ret->tx_frames);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "frame-bytes"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "frame-bytes"),
&ret->rx_frame_bytes, &ret->tx_frame_bytes);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "hw-frames"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "hw-frames"),
&ret->rx_hw_frames, &ret->tx_hw_frames);
- string_to_rx_tx_counters (ros_reply_param_val_by_key (r, "hw-frame-bytes"),
+ sstrto_rx_tx_counters (ros_reply_param_val_by_key (r, "hw-frame-bytes"),
&ret->rx_hw_frame_bytes, &ret->tx_hw_frame_bytes);
ret->rx_signal_strength = sstrtod (ros_reply_param_val_by_key (r, "signal-strength"));
return (ret);
} /* }}} ros_registration_table_t *rt_reply_to_regtable */
-static void rt_regtable_free (ros_registration_table_t *r) /* {{{ */
+static void rt_regtable_free (const ros_registration_table_t *r) /* {{{ */
{
- ros_registration_table_t *next;
+ const ros_registration_table_t *next;
while (r != NULL)
{
next = r->next;
- free (r);
+ free ((void *) r);
r = next;
}
} /* }}} void rt_regtable_free */
* Public functions
*/
int ros_registration_table (ros_connection_t *c, /* {{{ */
- ros_registration_table_handler handler, void *user_data)
+ ros_registration_table_handler_t handler, void *user_data)
{
rt_internal_data_t data;
--- /dev/null
+/**
+ * librouteros - src/ros_parse.c
+ * Copyright (C) 2009 Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ * Florian octo Forster <octo at verplant.org>
+ **/
+
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE
+#endif
+
+#ifndef _POSIX_C_SOURCE
+# define _POSIX_C_SOURCE 200112L
+#endif
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <string.h>
+#include <strings.h>
+#include <math.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "routeros_api.h"
+
+_Bool sstrtob (const char *str) /* {{{ */
+{
+ if (str == NULL)
+ return (false);
+
+ if (strcasecmp ("true", str) == 0)
+ return (true);
+ return (false);
+} /* }}} _Bool sstrtob */
+
+unsigned int sstrtoui (const char *str) /* {{{ */
+{
+ unsigned int ret;
+ char *endptr;
+
+ if (str == NULL)
+ return (0);
+
+ errno = 0;
+ endptr = NULL;
+ ret = (unsigned int) strtoul (str, &endptr, /* base = */ 10);
+ if ((endptr == str) || (errno != 0))
+ return (0);
+
+ return (ret);
+} /* }}} unsigned int sstrtoui */
+
+double sstrtod (const char *str) /* {{{ */
+{
+ double ret;
+ char *endptr;
+
+ if (str == NULL)
+ return (NAN);
+
+ errno = 0;
+ endptr = NULL;
+ ret = strtod (str, &endptr);
+ if ((endptr == str) || (errno != 0))
+ return (NAN);
+
+ return (ret);
+} /* }}} double sstrtod */
+
+int sstrto_rx_tx_counters (const char *str, /* {{{ */
+ uint64_t *rx, uint64_t *tx)
+{
+ const char *ptr;
+ char *endptr;
+
+ if ((rx == NULL) || (tx == NULL))
+ return (EINVAL);
+
+ *rx = 0;
+ *tx = 0;
+
+ if (str == NULL)
+ return (EINVAL);
+
+ ptr = str;
+ errno = 0;
+ endptr = NULL;
+ *rx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
+ if ((endptr == str) || (errno != 0))
+ {
+ *rx = 0;
+ return (EIO);
+ }
+
+ assert (endptr != NULL);
+ if ((*endptr != '/') && (*endptr != ','))
+ return (EIO);
+
+ ptr = endptr + 1;
+ errno = 0;
+ endptr = NULL;
+ *tx = (uint64_t) strtoull (ptr, &endptr, /* base = */ 10);
+ if ((endptr == str) || (errno != 0))
+ {
+ *rx = 0;
+ *tx = 0;
+ return (EIO);
+ }
+
+ return (0);
+} /* }}} int sstrto_rx_tx_counters */
+
+/* vim: set ts=2 sw=2 noet fdm=marker : */
--- /dev/null
+/**
+ * librouteros - src/ros_parse.h
+ * Copyright (C) 2009 Florian octo Forster
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; only version 2 of the License is applicable.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ * Florian octo Forster <octo at verplant.org>
+ **/
+
+#ifndef ROS_PARSE_H
+#define ROS_PARSE_H 1
+
+_Bool sstrtob (const char *str);
+
+unsigned int sstrtoui (const char *str);
+
+double sstrtod (const char *str);
+
+int sstrto_rx_tx_counters (const char *str, uint64_t *rx, uint64_t *tx);
+
+#endif /* ROS_PARSE_H */
+
+/* vim: set ts=2 sw=2 noet fdm=marker : */
projects / routeros-api.git / commitdiff