/**
- * 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
# define _POSIX_C_SOURCE 200112L
#endif
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#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 *);
return (status);
}
- assert (status <= want_bytes);
+ assert (((size_t) status) <= want_bytes);
have_bytes += status;
buffer_ptr += status;
}
return (0);
} /* }}} int reply_add_keyval */
+#if WITH_DEBUG
static void reply_dump (const ros_reply_t *r) /* {{{ */
{
if (r == NULL)
reply_dump (r->next);
} /* }}} void reply_dump */
+#else
+# define reply_dump(foo) /**/
+#endif
static void reply_free (ros_reply_t *r) /* {{{ */
{
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));
else
return (errno);
}
- assert (bytes_written <= buffer_size);
+ assert (((size_t) bytes_written) <= buffer_size);
buffer_ptr += bytes_written;
buffer_size -= bytes_written;
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)
ros_reply_t *head;
ros_reply_t *tail;
+ if (c == NULL)
+ return (NULL);
+
head = NULL;
tail = NULL;
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);
* =ret=ebddd18303a54111e2dea05a92ab46b4
* -- >8 --
*/
-
- printf ("login_handler has been called.\n");
reply_dump (r);
if (strcmp (r->status, "done") != 0)
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 */
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);