X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmain.c;h=a9417500b4c5538b8472c3e661d9e9aae82f8dc2;hb=895bb0f2ce317cee72a33004286eb66ffc253304;hp=113039489e782d9ebb55e67ad8866640ec3fd297;hpb=5a9c21cc2cbff2eb640008a88bb857ea3a888aee;p=routeros-api.git

diff --git a/src/main.c b/src/main.c
index 1130394..a941750 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
@@ -45,9 +45,9 @@
 #include "routeros_api.h"
 
 #if 1
-# define mt_debug(...) fprintf (stdout, __VA_ARGS__)
+# define ros_debug(...) fprintf (stdout, __VA_ARGS__)
 #else
-# define mt_debug(...) /**/
+# define ros_debug(...) /**/
 #endif
 
 /* FIXME */
@@ -56,27 +56,27 @@ char *strdup (const char *);
 /*
  * Private structures
  */
-struct mt_connection_s
+struct ros_connection_s
 {
 	int fd;
 };
 
-struct mt_reply_s
+struct ros_reply_s
 {
 	unsigned int params_num;
 	char *status;
 	char **keys;
 	char **values;
 
-	mt_reply_t *next;
+	ros_reply_t *next;
 };
 
-struct mt_login_data_s
+struct ros_login_data_s
 {
 	const char *username;
 	const char *password;
 };
-typedef struct mt_login_data_s mt_login_data_t;
+typedef struct ros_login_data_s ros_login_data_t;
 
 /*
  * Private functions
@@ -118,9 +118,9 @@ static int read_exact (int fd, void *buffer, size_t buffer_size) /* {{{ */
 	return (0);
 } /* }}} int read_exact */
 
-static mt_reply_t *reply_alloc (void) /* {{{ */
+static ros_reply_t *reply_alloc (void) /* {{{ */
 {
-	mt_reply_t *r;
+	ros_reply_t *r;
 
 	r = malloc (sizeof (*r));
 	if (r == NULL)
@@ -132,9 +132,9 @@ static mt_reply_t *reply_alloc (void) /* {{{ */
 	r->next = NULL;
 
 	return (r);
-} /* }}} mt_reply_s *reply_alloc */
+} /* }}} ros_reply_s *reply_alloc */
 
-static int reply_add_keyval (mt_reply_t *r, const char *key, /* {{{ */
+static int reply_add_keyval (ros_reply_t *r, const char *key, /* {{{ */
 		const char *val)
 {
 	char **tmp;
@@ -165,7 +165,7 @@ static int reply_add_keyval (mt_reply_t *r, const char *key, /* {{{ */
 	return (0);
 } /* }}} int reply_add_keyval */
 
-static void reply_dump (const mt_reply_t *r) /* {{{ */
+static void reply_dump (const ros_reply_t *r) /* {{{ */
 {
 	if (r == NULL)
 		return;
@@ -189,9 +189,9 @@ static void reply_dump (const mt_reply_t *r) /* {{{ */
 	reply_dump (r->next);
 } /* }}} void reply_dump */
 
-static void reply_free (mt_reply_t *r) /* {{{ */
+static void reply_free (ros_reply_t *r) /* {{{ */
 {
-	mt_reply_t *next;
+	ros_reply_t *next;
 	unsigned int i;
 
 	if (r == NULL)
@@ -327,7 +327,7 @@ static int buffer_end (char **ret_buffer, size_t *ret_buffer_size) /* {{{ */
 	return (0);
 } /* }}} int buffer_end */
 
-static int send_command (mt_connection_t *c, /* {{{ */
+static int send_command (ros_connection_t *c, /* {{{ */
 		const char *command,
 		size_t args_num, const char * const *args)
 {
@@ -348,6 +348,7 @@ static int send_command (mt_connection_t *c, /* {{{ */
 	if (status != 0)
 		return (status);
 
+	ros_debug ("send_command: command = %s;\n", command);
 	status = buffer_add (&buffer_ptr, &buffer_size, command);
 	if (status != 0)
 		return (status);
@@ -357,6 +358,7 @@ static int send_command (mt_connection_t *c, /* {{{ */
 		if (args[i] == NULL)
 			return (EINVAL);
 
+		ros_debug ("send_command: arg[%zu] = %s;\n", i, args[i]);
 		status = buffer_add (&buffer_ptr, &buffer_size, args[i]);
 		if (status != 0)
 			return (status);
@@ -390,7 +392,7 @@ static int send_command (mt_connection_t *c, /* {{{ */
 	return (0);
 } /* }}} int send_command */
 
-static int read_word (mt_connection_t *c, /* {{{ */
+static int read_word (ros_connection_t *c, /* {{{ */
 		char *buffer, size_t *buffer_size)
 {
 	size_t req_size;
@@ -406,48 +408,48 @@ static int read_word (mt_connection_t *c, /* {{{ */
 		return (status);
 
 	/* Calculate `req_size' */
-	if (((unsigned char) buffer[0]) == 0xF0) /* {{{ */
+	if (((unsigned char) word_length[0]) == 0xF0) /* {{{ */
 	{
 		status = read_exact (c->fd, &word_length[1], 4);
 		if (status != 0)
 			return (status);
 
-		req_size = (buffer[1] << 24)
-			| (buffer[2] << 16)
-			| (buffer[3] << 8)
-			| buffer[4];
+		req_size = (word_length[1] << 24)
+			| (word_length[2] << 16)
+			| (word_length[3] << 8)
+			| word_length[4];
 	}
-	else if ((buffer[0] & 0xE0) == 0xE0)
+	else if ((word_length[0] & 0xE0) == 0xE0)
 	{
 		status = read_exact (c->fd, &word_length[1], 3);
 		if (status != 0)
 			return (status);
 
-		req_size = ((buffer[0] & 0x1F) << 24)
-			| (buffer[1] << 16)
-			| (buffer[2] << 8)
-			| buffer[3];
+		req_size = ((word_length[0] & 0x1F) << 24)
+			| (word_length[1] << 16)
+			| (word_length[2] << 8)
+			| word_length[3];
 	}
-	else if ((buffer[0] & 0xC0) == 0xC0)
+	else if ((word_length[0] & 0xC0) == 0xC0)
 	{
 		status = read_exact (c->fd, &word_length[1], 2);
 		if (status != 0)
 			return (status);
 
-		req_size = ((buffer[0] & 0x3F) << 16)
-			| (buffer[1] << 8)
-			| buffer[2];
+		req_size = ((word_length[0] & 0x3F) << 16)
+			| (word_length[1] << 8)
+			| word_length[2];
 	}
-	else if ((buffer[0] & 0x80) == 0x80)
+	else if ((word_length[0] & 0x80) == 0x80)
 	{
 		status = read_exact (c->fd, &word_length[1], 1);
 		if (status != 0)
 			return (status);
 
-		req_size = ((buffer[0] & 0x7F) << 8)
-			| buffer[1];
+		req_size = ((word_length[0] & 0x7F) << 8)
+			| word_length[1];
 	}
-	else if ((buffer[0] & 0x80) == 0)
+	else if ((word_length[0] & 0x80) == 0)
 	{
 		req_size = (size_t) word_length[0];
 	}
@@ -476,17 +478,17 @@ static int read_word (mt_connection_t *c, /* {{{ */
 	return (0);
 } /* }}} int buffer_decode_next */
 
-static mt_reply_t *receive_reply (mt_connection_t *c) /* {{{ */
+static ros_reply_t *receive_sentence (ros_connection_t *c) /* {{{ */
 {
 	char buffer[4096];
 	size_t buffer_size;
 	int status;
 
-	mt_reply_t *head;
-	mt_reply_t *tail;
+	ros_reply_t *r;
 
-	head = NULL;
-	tail = NULL;
+	r = reply_alloc ();
+	if (r == NULL)
+		return (NULL);
 
 	while (42)
 	{
@@ -503,33 +505,11 @@ static mt_reply_t *receive_reply (mt_connection_t *c) /* {{{ */
 
 		if (buffer[0] == '!') /* {{{ */
 		{
-			mt_reply_t *tmp;
-
-			tmp = reply_alloc ();
-			if (tmp == NULL)
-			{
-				status = ENOMEM;
+			if (r->status != NULL)
+				free (r->status);
+			r->status = strdup (&buffer[1]);
+			if (r->status == NULL)
 				break;
-			}
-
-			tmp->status = strdup (&buffer[1]);
-			if (tmp->status == NULL)
-			{
-				reply_free (tmp);
-				status = ENOMEM;
-				break;
-			}
-
-			if (tail == NULL)
-			{
-				head = tmp;
-				tail = tmp;
-			}
-			else
-			{
-				tail->next = tmp;
-				tail = tmp;
-			}
 		} /* }}} if (buffer[0] == '!') */
 		else if (buffer[0] == '=') /* {{{ */
 		{
@@ -546,22 +526,56 @@ static mt_reply_t *receive_reply (mt_connection_t *c) /* {{{ */
 			*val = 0;
 			val++;
 
-			reply_add_keyval (tail, key, val);
+			reply_add_keyval (r, key, val);
 		} /* }}} if (buffer[0] == '=') */
 		else
 		{
-			printf ("Ignoring unknown word: %s\n", buffer);
+			ros_debug ("receive_sentence: Ignoring unknown word: %s\n", buffer);
 		}
 	} /* while (42) */
 	
-	if (status != 0)
+	if (r->status == NULL)
 	{
-		reply_free (head);
+		reply_free (r);
 		return (NULL);
 	}
 
+	return (r);
+} /* }}} ros_reply_t *receive_sentence */
+
+static ros_reply_t *receive_reply (ros_connection_t *c) /* {{{ */
+{
+	ros_reply_t *head;
+	ros_reply_t *tail;
+
+	head = NULL;
+	tail = NULL;
+
+	while (42)
+	{
+		ros_reply_t *tmp;
+
+		tmp = receive_sentence (c);
+		if (tmp == NULL)
+			break;
+
+		if (tail == NULL)
+		{
+			head = tmp;
+			tail = tmp;
+		}
+		else
+		{
+			tail->next = tmp;
+			tail = tmp;
+		}
+
+		if (strcmp ("done", tmp->status) == 0)
+			break;
+	} /* while (42) */
+	
 	return (head);
-} /* }}} mt_reply_t *receive_reply */
+} /* }}} ros_reply_t *receive_reply */
 
 static int create_socket (const char *node, const char *service) /* {{{ */
 {
@@ -570,7 +584,7 @@ static int create_socket (const char *node, const char *service) /* {{{ */
 	struct addrinfo *ai_ptr;
 	int status;
 
-	mt_debug ("create_socket (node = %s, service = %s);\n",
+	ros_debug ("create_socket (node = %s, service = %s);\n",
 			node, service);
 
 	memset (&ai_hint, 0, sizeof (ai_hint));
@@ -595,14 +609,14 @@ static int create_socket (const char *node, const char *service) /* {{{ */
 				ai_ptr->ai_protocol);
 		if (fd < 0)
 		{
-			mt_debug ("create_socket: socket(2) failed.\n");
+			ros_debug ("create_socket: socket(2) failed.\n");
 			continue;
 		}
 
 		status = connect (fd, ai_ptr->ai_addr, ai_ptr->ai_addrlen);
 		if (status != 0)
 		{
-			mt_debug ("create_socket: connect(2) failed.\n");
+			ros_debug ("create_socket: connect(2) failed.\n");
 			close (fd);
 			continue;
 		}
@@ -615,7 +629,7 @@ static int create_socket (const char *node, const char *service) /* {{{ */
 	return (-1);
 } /* }}} int create_socket */
 
-static int login2_handler (mt_connection_t *c, const mt_reply_t *r, /* {{{ */
+static int login2_handler (ros_connection_t *c, const ros_reply_t *r, /* {{{ */
 		void *user_data)
 {
 	if (r == NULL)
@@ -624,6 +638,18 @@ static int login2_handler (mt_connection_t *c, const mt_reply_t *r, /* {{{ */
 	printf ("login2_handler has been called.\n");
 	reply_dump (r);
 
+	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);
+	}
+
 	return (0);
 } /* }}} int login2_handler */
 
@@ -680,13 +706,13 @@ static void make_password_hash (char response_hex[33], /* {{{ */
 	hash_binary_to_hex (response_hex, response_bin);
 } /* }}} void make_password_hash */
 
-static int login_handler (mt_connection_t *c, const mt_reply_t *r, /* {{{ */
+static int login_handler (ros_connection_t *c, const ros_reply_t *r, /* {{{ */
 		void *user_data)
 {
 	const char *ret;
 	char challenge_hex[33];
 	char response_hex[33];
-	mt_login_data_t *login_data;
+	ros_login_data_t *login_data;
 
 	const char *params[2];
 	char param_name[1024];
@@ -695,24 +721,37 @@ static int login_handler (mt_connection_t *c, const mt_reply_t *r, /* {{{ */
 	if (r == NULL)
 		return (EINVAL);
 
+	/* The expected result looks like this:
+	 * -- 8< --
+	 *  !done 
+	 *  =ret=ebddd18303a54111e2dea05a92ab46b4
+	 * -- >8 --
+	 */
+
 	printf ("login_handler has been called.\n");
 	reply_dump (r);
 
+	if (strcmp (r->status, "done") != 0)
+	{
+		ros_debug ("login_handler: Unexpected status: %s.\n", r->status);
+		return (EPROTO);
+	}
+
 	login_data = user_data;
 	if (login_data == NULL)
 		return (EINVAL);
 
-	ret = mt_reply_param_val_by_key (r, "ret");
+	ret = ros_reply_param_val_by_key (r, "ret");
 	if (ret == NULL)
 	{
-		mt_debug ("login_handler: Reply does not have parameter \"ret\".\n");
+		ros_debug ("login_handler: Reply does not have parameter \"ret\".\n");
 		return (EPROTO);
 	}
-	mt_debug ("login_handler: ret = %s;\n", ret);
+	ros_debug ("login_handler: ret = %s;\n", ret);
 
 	if (strlen (ret) != 32)
 	{
-		mt_debug ("login_handler: Unexpected length of the \"ret\" argument.\n");
+		ros_debug ("login_handler: Unexpected length of the \"ret\" argument.\n");
 		return (EPROTO);
 	}
 	strcpy (challenge_hex, ret);
@@ -727,20 +766,20 @@ static int login_handler (mt_connection_t *c, const mt_reply_t *r, /* {{{ */
 	params[0] = param_name;
 	params[1] = param_response;
 
-	return (mt_query (c, "/login", 2, params, login2_handler,
+	return (ros_query (c, "/login", 2, params, login2_handler,
 				/* user data = */ NULL));
 } /* }}} int login_handler */
 
 /*
  * Public functions
  */
-mt_connection_t *mt_connect (const char *node, const char *service, /* {{{ */
+ros_connection_t *ros_connect (const char *node, const char *service, /* {{{ */
 		const char *username, const char *password)
 {
 	int fd;
-	mt_connection_t *c;
+	ros_connection_t *c;
 	int status;
-	mt_login_data_t user_data;
+	ros_login_data_t user_data;
 
 	if ((node == NULL) || (username == NULL) || (password == NULL))
 		return (NULL);
@@ -761,13 +800,20 @@ mt_connection_t *mt_connect (const char *node, const char *service, /* {{{ */
 
 	user_data.username = username;
 	user_data.password = password;
-	status = mt_query (c, "/login", /* args num = */ 0, /* args = */ NULL,
+	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);
-} /* }}} mt_connection_t *mt_connect */
+} /* }}} ros_connection_t *ros_connect */
 
-int mt_disconnect (mt_connection_t *c) /* {{{ */
+int ros_disconnect (ros_connection_t *c) /* {{{ */
 {
 	if (c == NULL)
 		return (EINVAL);
@@ -781,15 +827,15 @@ int mt_disconnect (mt_connection_t *c) /* {{{ */
 	free (c);
 
 	return (0);
-} /* }}} int mt_disconnect */
+} /* }}} int ros_disconnect */
 
-int mt_query (mt_connection_t *c, /* {{{ */
+int ros_query (ros_connection_t *c, /* {{{ */
 		const char *command,
 		size_t args_num, const char * const *args,
-		mt_reply_handler_t handler, void *user_data)
+		ros_reply_handler_t handler, void *user_data)
 {
 	int status;
-	mt_reply_t *r;
+	ros_reply_t *r;
 
 	status = send_command (c, command, args_num, args);
 	if (status != 0)
@@ -807,36 +853,36 @@ int mt_query (mt_connection_t *c, /* {{{ */
 
 	/* ... and return. */
 	return (status);
-} /* }}} int mt_query */
+} /* }}} int ros_query */
 
-const mt_reply_t *mt_reply_next (const mt_reply_t *r) /* {{{ */
+const ros_reply_t *ros_reply_next (const ros_reply_t *r) /* {{{ */
 {
 	if (r == NULL)
 		return (NULL);
 
 	return (r->next);
-} /* }}} mt_reply_t *mt_reply_next */
+} /* }}} ros_reply_t *ros_reply_next */
 
-int mt_reply_num (const mt_reply_t *r) /* {{{ */
+int ros_reply_num (const ros_reply_t *r) /* {{{ */
 {
 	int ret;
-	const mt_reply_t *ptr;
+	const ros_reply_t *ptr;
 
 	ret = 0;
 	for (ptr = r; ptr != NULL; ptr = ptr->next)
 		ret++;
 
 	return (ret);
-} /* }}} int mt_reply_num */
+} /* }}} int ros_reply_num */
 
-const char *mt_reply_status (const mt_reply_t *r) /* {{{ */
+const char *ros_reply_status (const ros_reply_t *r) /* {{{ */
 {
 	if (r == NULL)
 		return (NULL);
 	return (r->status);
-} /* }}} char *mt_reply_status */
+} /* }}} char *ros_reply_status */
 
-const char *mt_reply_param_key_by_index (const mt_reply_t *r, /* {{{ */
+const char *ros_reply_param_key_by_index (const ros_reply_t *r, /* {{{ */
 		unsigned int index)
 {
 	if (r == NULL)
@@ -846,9 +892,9 @@ const char *mt_reply_param_key_by_index (const mt_reply_t *r, /* {{{ */
 		return (NULL);
 
 	return (r->keys[index]);
-} /* }}} char *mt_reply_param_key_by_index */
+} /* }}} char *ros_reply_param_key_by_index */
 
-const char *mt_reply_param_val_by_index (const mt_reply_t *r, /* {{{ */
+const char *ros_reply_param_val_by_index (const ros_reply_t *r, /* {{{ */
 		unsigned int index)
 {
 	if (r == NULL)
@@ -858,9 +904,9 @@ const char *mt_reply_param_val_by_index (const mt_reply_t *r, /* {{{ */
 		return (NULL);
 
 	return (r->values[index]);
-} /* }}} char *mt_reply_param_key_by_index */
+} /* }}} char *ros_reply_param_key_by_index */
 
-const char *mt_reply_param_val_by_key (const mt_reply_t *r, /* {{{ */
+const char *ros_reply_param_val_by_key (const ros_reply_t *r, /* {{{ */
 		const char *key)
 {
 	unsigned int i;
@@ -873,6 +919,16 @@ const char *mt_reply_param_val_by_key (const mt_reply_t *r, /* {{{ */
 			return (r->values[i]);
 
 	return (NULL);
-} /* }}} char *mt_reply_param_val_by_key */
+} /* }}} 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 : */