X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmain.c;h=31e1f8b73f1de60a216805df140b0af5989eb53d;hb=HEAD;hp=5f77a5d7b71e9fb8f019a7dbce4fd283d769f7d6;hpb=174acd58a64f43b6f7dc3efa61561b232169a2fd;p=routeros-api.git diff --git a/src/main.c b/src/main.c index 5f77a5d..31e1f8b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,19 +1,18 @@ /** - * libmikrotik - src/main.c + * librouteros - src/main.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. + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * 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 + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. * * Authors: * Florian octo Forster @@ -27,6 +26,8 @@ # define _POSIX_C_SOURCE 200112L #endif +#include "config.h" + #include #include #include @@ -44,12 +45,16 @@ #include "routeros_api.h" -#if 1 +#if WITH_DEBUG # define ros_debug(...) fprintf (stdout, __VA_ARGS__) #else # define ros_debug(...) /**/ #endif +#if !__GNUC__ +# define __attribute__(x) /**/ +#endif + /* FIXME */ char *strdup (const char *); @@ -110,7 +115,7 @@ static int read_exact (int fd, void *buffer, size_t buffer_size) /* {{{ */ return (status); } - assert (status <= want_bytes); + assert (((size_t) status) <= want_bytes); have_bytes += status; buffer_ptr += status; } @@ -165,6 +170,7 @@ static int reply_add_keyval (ros_reply_t *r, const char *key, /* {{{ */ return (0); } /* }}} int reply_add_keyval */ +#if WITH_DEBUG static void reply_dump (const ros_reply_t *r) /* {{{ */ { if (r == NULL) @@ -188,6 +194,9 @@ static void reply_dump (const ros_reply_t *r) /* {{{ */ reply_dump (r->next); } /* }}} void reply_dump */ +#else +# define reply_dump(foo) /**/ +#endif static void reply_free (ros_reply_t *r) /* {{{ */ { @@ -205,6 +214,7 @@ static void reply_free (ros_reply_t *r) /* {{{ */ free (r->values[i]); } + free (r->status); free (r->keys); free (r->values); @@ -338,6 +348,12 @@ static int send_command (ros_connection_t *c, /* {{{ */ size_t i; int status; + assert (c != NULL); + assert (command != NULL); + + if ((args == NULL) && (args_num > 0)) + return (EINVAL); + /* FIXME: For debugging only */ memset (buffer, 0, sizeof (buffer)); @@ -383,7 +399,7 @@ static int send_command (ros_connection_t *c, /* {{{ */ else return (errno); } - assert (bytes_written <= buffer_size); + assert (((size_t) bytes_written) <= buffer_size); buffer_ptr += bytes_written; buffer_size -= bytes_written; @@ -402,6 +418,8 @@ static int read_word (ros_connection_t *c, /* {{{ */ if ((buffer == NULL) || (*buffer_size < 1)) return (EINVAL); + assert (c != NULL); + /* read one byte from the socket */ status = read_exact (c->fd, word_length, 1); if (status != 0) @@ -548,6 +566,9 @@ static ros_reply_t *receive_reply (ros_connection_t *c) /* {{{ */ ros_reply_t *head; ros_reply_t *tail; + if (c == NULL) + return (NULL); + head = NULL; tail = NULL; @@ -621,24 +642,30 @@ static int create_socket (const char *node, const char *service) /* {{{ */ continue; } + freeaddrinfo (ai_list); return (fd); } freeaddrinfo (ai_list); - return (-1); } /* }}} int create_socket */ -static int login2_handler (ros_connection_t *c, const ros_reply_t *r, /* {{{ */ - void *user_data) +static int login2_handler (__attribute__((unused)) ros_connection_t *c, /* {{{ */ + const ros_reply_t *r, + __attribute__((unused)) void *user_data) { if (r == NULL) return (EINVAL); - printf ("login2_handler has been called.\n"); reply_dump (r); - if (strcmp (r->status, "done") != 0) + if (strcmp (r->status, "trap") == 0) + { + ros_debug ("login2_handler: Logging in failed: %s.\n", + ros_reply_param_val_by_key (r, "message")); + return (EACCES); + } + else if (strcmp (r->status, "done") != 0) { ros_debug ("login2_handler: Unexpected status: %s.\n", r->status); return (EPROTO); @@ -721,8 +748,6 @@ static int login_handler (ros_connection_t *c, const ros_reply_t *r, /* {{{ */ * =ret=ebddd18303a54111e2dea05a92ab46b4 * -- >8 -- */ - - printf ("login_handler has been called.\n"); reply_dump (r); if (strcmp (r->status, "done") != 0) @@ -797,6 +822,13 @@ ros_connection_t *ros_connect (const char *node, const char *service, /* {{{ */ status = ros_query (c, "/login", /* args num = */ 0, /* args = */ NULL, login_handler, &user_data); + if (status != 0) + { + ros_disconnect (c); + errno = status; + return (NULL); + } + return (c); } /* }}} ros_connection_t *ros_connect */ @@ -824,6 +856,9 @@ int ros_query (ros_connection_t *c, /* {{{ */ int status; ros_reply_t *r; + if ((c == NULL) || (command == NULL) || (handler == NULL)) + return (EINVAL); + status = send_command (c, command, args_num, args); if (status != 0) return (status); @@ -908,4 +943,14 @@ const char *ros_reply_param_val_by_key (const ros_reply_t *r, /* {{{ */ return (NULL); } /* }}} char *ros_reply_param_val_by_key */ +int ros_version (void) /* {{{ */ +{ + return (ROS_VERSION); +} /* }}} int ros_version */ + +const char *ros_version_string (void) /* {{{ */ +{ + return (ROS_VERSION_STRING); +} /* }}} char *ros_version_string */ + /* vim: set ts=2 sw=2 noet fdm=marker : */