X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmain.c;h=a8ecb4344a083556f34da131e5c4387c20224bcf;hb=34593faf57c4213e4f47a3ff59f3f76ca3402953;hp=53e96c2168146b0c599df342a540092e3037cc29;hpb=aa02c3dfe7142904ddec12dbc55a9c7b55f1a4f9;p=routeros-api.git

diff --git a/src/main.c b/src/main.c
index 53e96c2..a8ecb43 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /**
- * 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
@@ -27,6 +27,8 @@
 # define _POSIX_C_SOURCE 200112L
 #endif
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -44,12 +46,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 +116,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 +171,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 +195,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 +215,7 @@ static void reply_free (ros_reply_t *r) /* {{{ */
 		free (r->values[i]);
 	}
 
+	free (r->status);
 	free (r->keys);
 	free (r->values);
 
@@ -338,6 +349,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 +400,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 +419,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 +567,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;
 
@@ -629,16 +651,22 @@ static int create_socket (const char *node, const char *service) /* {{{ */
 	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 +749,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 +823,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 +857,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);