Relicense to ISC License.

[routeros-api.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index d492b48..31e1f8b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2,18 +2,17 @@
  * 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 <octo at verplant.org>
@@ -52,6 +51,10 @@
 # define ros_debug(...) /**/
 #endif
 
+#if !__GNUC__
+# define __attribute__(x) /**/
+#endif
+
 /* FIXME */
 char *strdup (const char *);
 
@@ -211,6 +214,7 @@ static void reply_free (ros_reply_t *r) /* {{{ */
                free (r->values[i]);
        }
 
+       free (r->status);
        free (r->keys);
        free (r->values);
 
@@ -344,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));
 
@@ -408,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)
@@ -554,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;
 
@@ -627,16 +642,17 @@ 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);
@@ -840,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);