add config library : jsmn

Makefile.am

@@ -25,6 +25,8 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/lib/core/include \
     -I$(top_srcdir)/src
 
+dist_sysconf_DATA = support/nextepc.conf
+
 CLEANFILES = symtbl.c
 DISTCLEANFILES = $(DIST_ARCHIVES)
 MAINTAINERCLEANFILES = \

lib/core/include/core_jsmn.h

@@ -0,0 +1,76 @@
+#ifndef __CORE_JSMN_H__
+#define __CORE_JSMN_H__
+
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * JSON type identifier. Basic types are:
+ * 	o Object
+ * 	o Array
+ * 	o String
+ * 	o Other primitive: number, boolean (true/false) or null
+ */
+typedef enum {
+	JSMN_UNDEFINED = 0,
+	JSMN_OBJECT = 1,
+	JSMN_ARRAY = 2,
+	JSMN_STRING = 3,
+	JSMN_PRIMITIVE = 4
+} jsmntype_t;
+
+enum jsmnerr {
+	/* Not enough tokens were provided */
+	JSMN_ERROR_NOMEM = -1,
+	/* Invalid character inside JSON string */
+	JSMN_ERROR_INVAL = -2,
+	/* The string is not a full JSON packet, more bytes expected */
+	JSMN_ERROR_PART = -3
+};
+
+/**
+ * JSON token description.
+ * type		type (object, array, string etc.)
+ * start	start position in JSON data string
+ * end		end position in JSON data string
+ */
+typedef struct {
+	jsmntype_t type;
+	int start;
+	int end;
+	int size;
+#ifdef JSMN_PARENT_LINKS
+	int parent;
+#endif
+} jsmntok_t;
+
+/**
+ * JSON parser. Contains an array of token blocks available. Also stores
+ * the string being parsed now and current position in that string
+ */
+typedef struct {
+	unsigned int pos; /* offset in the JSON string */
+	unsigned int toknext; /* next token to allocate */
+	int toksuper; /* superior token node, e.g parent object or array */
+} jsmn_parser;
+
+/**
+ * Create JSON parser over an array of tokens
+ */
+void jsmn_init(jsmn_parser *parser);
+
+/**
+ * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
+ * a single JSON object.
+ */
+int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
+		jsmntok_t *tokens, unsigned int num_tokens);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __JSMN_H_ */

lib/core/src/Makefile.am

@@ -18,12 +18,13 @@ libcore_la_SOURCES = \
 	../include/core_signal.h ../include/core_thread.h ../include/core_time.h \
 	../include/core_timer.h ../include/core_tlv.h ../include/core_tlv_msg.h \
 	../include/core_atomic.h ../include/core_portable.h \
-	../include/core_version.h ../include/core_event.h ../include/core_hash.h
+	../include/core_version.h ../include/core_event.h ../include/core_hash.h \
+	../include/core_jsmn.h
 
 nodist_libcore_la_SOURCES = \
     debug.c fsm.c msgq.c ringbuf.c timer.c tlv.c tlv_msg.c \
 	aes.c aes_cmac.c sha1.c sha1_hmac.c sha2.c sha2_hmac.c misc.c event.c \
-	hash.c
+	hash.c jsmn.c
 
 libcore_la_DEPENDENCIES = \
     $(top_srcdir)/lib/core/src/@OSDIR@/libcore@OSDIR@.la

lib/core/src/jsmn.c

@@ -0,0 +1,314 @@
+#include "core_jsmn.h"
+
+/**
+ * Allocates a fresh unused token from the token pull.
+ */
+static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
+		jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *tok;
+	if (parser->toknext >= num_tokens) {
+		return NULL;
+	}
+	tok = &tokens[parser->toknext++];
+	tok->start = tok->end = -1;
+	tok->size = 0;
+#ifdef JSMN_PARENT_LINKS
+	tok->parent = -1;
+#endif
+	return tok;
+}
+
+/**
+ * Fills token type and boundaries.
+ */
+static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
+                            int start, int end) {
+	token->type = type;
+	token->start = start;
+	token->end = end;
+	token->size = 0;
+}
+
+/**
+ * Fills next available token with JSON primitive.
+ */
+static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
+		size_t len, jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *token;
+	int start;
+
+	start = parser->pos;
+
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		switch (js[parser->pos]) {
+#ifndef JSMN_STRICT
+			/* In strict mode primitive must be followed by "," or "}" or "]" */
+			case ':':
+#endif
+			case '\t' : case '\r' : case '\n' : case ' ' :
+			case ','  : case ']'  : case '}' :
+				goto found;
+		}
+		if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
+			parser->pos = start;
+			return JSMN_ERROR_INVAL;
+		}
+	}
+#ifdef JSMN_STRICT
+	/* In strict mode primitive must be followed by a comma/object/array */
+	parser->pos = start;
+	return JSMN_ERROR_PART;
+#endif
+
+found:
+	if (tokens == NULL) {
+		parser->pos--;
+		return 0;
+	}
+	token = jsmn_alloc_token(parser, tokens, num_tokens);
+	if (token == NULL) {
+		parser->pos = start;
+		return JSMN_ERROR_NOMEM;
+	}
+	jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
+#ifdef JSMN_PARENT_LINKS
+	token->parent = parser->toksuper;
+#endif
+	parser->pos--;
+	return 0;
+}
+
+/**
+ * Fills next token with JSON string.
+ */
+static int jsmn_parse_string(jsmn_parser *parser, const char *js,
+		size_t len, jsmntok_t *tokens, size_t num_tokens) {
+	jsmntok_t *token;
+
+	int start = parser->pos;
+
+	parser->pos++;
+
+	/* Skip starting quote */
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		char c = js[parser->pos];
+
+		/* Quote: end of string */
+		if (c == '\"') {
+			if (tokens == NULL) {
+				return 0;
+			}
+			token = jsmn_alloc_token(parser, tokens, num_tokens);
+			if (token == NULL) {
+				parser->pos = start;
+				return JSMN_ERROR_NOMEM;
+			}
+			jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
+#ifdef JSMN_PARENT_LINKS
+			token->parent = parser->toksuper;
+#endif
+			return 0;
+		}
+
+		/* Backslash: Quoted symbol expected */
+		if (c == '\\' && parser->pos + 1 < len) {
+			int i;
+			parser->pos++;
+			switch (js[parser->pos]) {
+				/* Allowed escaped symbols */
+				case '\"': case '/' : case '\\' : case 'b' :
+				case 'f' : case 'r' : case 'n'  : case 't' :
+					break;
+				/* Allows escaped symbol \uXXXX */
+				case 'u':
+					parser->pos++;
+					for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
+						/* If it isn't a hex character we have an error */
+						if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
+									(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
+									(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
+							parser->pos = start;
+							return JSMN_ERROR_INVAL;
+						}
+						parser->pos++;
+					}
+					parser->pos--;
+					break;
+				/* Unexpected symbol */
+				default:
+					parser->pos = start;
+					return JSMN_ERROR_INVAL;
+			}
+		}
+	}
+	parser->pos = start;
+	return JSMN_ERROR_PART;
+}
+
+/**
+ * Parse JSON string and fill tokens.
+ */
+int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
+		jsmntok_t *tokens, unsigned int num_tokens) {
+	int r;
+	int i;
+	jsmntok_t *token;
+	int count = parser->toknext;
+
+	for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
+		char c;
+		jsmntype_t type;
+
+		c = js[parser->pos];
+		switch (c) {
+			case '{': case '[':
+				count++;
+				if (tokens == NULL) {
+					break;
+				}
+				token = jsmn_alloc_token(parser, tokens, num_tokens);
+				if (token == NULL)
+					return JSMN_ERROR_NOMEM;
+				if (parser->toksuper != -1) {
+					tokens[parser->toksuper].size++;
+#ifdef JSMN_PARENT_LINKS
+					token->parent = parser->toksuper;
+#endif
+				}
+				token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
+				token->start = parser->pos;
+				parser->toksuper = parser->toknext - 1;
+				break;
+			case '}': case ']':
+				if (tokens == NULL)
+					break;
+				type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
+#ifdef JSMN_PARENT_LINKS
+				if (parser->toknext < 1) {
+					return JSMN_ERROR_INVAL;
+				}
+				token = &tokens[parser->toknext - 1];
+				for (;;) {
+					if (token->start != -1 && token->end == -1) {
+						if (token->type != type) {
+							return JSMN_ERROR_INVAL;
+						}
+						token->end = parser->pos + 1;
+						parser->toksuper = token->parent;
+						break;
+					}
+					if (token->parent == -1) {
+						if(token->type != type || parser->toksuper == -1) {
+							return JSMN_ERROR_INVAL;
+						}
+						break;
+					}
+					token = &tokens[token->parent];
+				}
+#else
+				for (i = parser->toknext - 1; i >= 0; i--) {
+					token = &tokens[i];
+					if (token->start != -1 && token->end == -1) {
+						if (token->type != type) {
+							return JSMN_ERROR_INVAL;
+						}
+						parser->toksuper = -1;
+						token->end = parser->pos + 1;
+						break;
+					}
+				}
+				/* Error if unmatched closing bracket */
+				if (i == -1) return JSMN_ERROR_INVAL;
+				for (; i >= 0; i--) {
+					token = &tokens[i];
+					if (token->start != -1 && token->end == -1) {
+						parser->toksuper = i;
+						break;
+					}
+				}
+#endif
+				break;
+			case '\"':
+				r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
+				if (r < 0) return r;
+				count++;
+				if (parser->toksuper != -1 && tokens != NULL)
+					tokens[parser->toksuper].size++;
+				break;
+			case '\t' : case '\r' : case '\n' : case ' ':
+				break;
+			case ':':
+				parser->toksuper = parser->toknext - 1;
+				break;
+			case ',':
+				if (tokens != NULL && parser->toksuper != -1 &&
+						tokens[parser->toksuper].type != JSMN_ARRAY &&
+						tokens[parser->toksuper].type != JSMN_OBJECT) {
+#ifdef JSMN_PARENT_LINKS
+					parser->toksuper = tokens[parser->toksuper].parent;
+#else
+					for (i = parser->toknext - 1; i >= 0; i--) {
+						if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
+							if (tokens[i].start != -1 && tokens[i].end == -1) {
+								parser->toksuper = i;
+								break;
+							}
+						}
+					}
+#endif
+				}
+				break;
+#ifdef JSMN_STRICT
+			/* In strict mode primitives are: numbers and booleans */
+			case '-': case '0': case '1' : case '2': case '3' : case '4':
+			case '5': case '6': case '7' : case '8': case '9':
+			case 't': case 'f': case 'n' :
+				/* And they must not be keys of the object */
+				if (tokens != NULL && parser->toksuper != -1) {
+					jsmntok_t *t = &tokens[parser->toksuper];
+					if (t->type == JSMN_OBJECT ||
+							(t->type == JSMN_STRING && t->size != 0)) {
+						return JSMN_ERROR_INVAL;
+					}
+				}
+#else
+			/* In non-strict mode every unquoted value is a primitive */
+			default:
+#endif
+				r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
+				if (r < 0) return r;
+				count++;
+				if (parser->toksuper != -1 && tokens != NULL)
+					tokens[parser->toksuper].size++;
+				break;
+
+#ifdef JSMN_STRICT
+			/* Unexpected char in strict mode */
+			default:
+				return JSMN_ERROR_INVAL;
+#endif
+		}
+	}
+
+	if (tokens != NULL) {
+		for (i = parser->toknext - 1; i >= 0; i--) {
+			/* Unmatched opened object or array */
+			if (tokens[i].start != -1 && tokens[i].end == -1) {
+				return JSMN_ERROR_PART;
+			}
+		}
+	}
+
+	return count;
+}
+
+/**
+ * Creates a new parser based over a given  buffer with an array of tokens
+ * available.
+ */
+void jsmn_init(jsmn_parser *parser) {
+	parser->pos = 0;
+	parser->toknext = 0;
+	parser->toksuper = -1;
+}
+

lib/s1ap/Makefile.am

@@ -5,7 +5,7 @@ SUBDIRS = asn1c
 noinst_LTLIBRARIES = libs1ap.la
 
 libs1ap_la_SOURCES = \
-	s1ap_ies_defs.h s1ap_codecs.h
+	s1ap_asn1c.h s1ap_ies_defs.h s1ap_message.h
 
 nodist_libs1ap_la_SOURCES = \
 	s1ap_encoder.c s1ap_decoder.c s1ap_free.c \

src/Makefile.am

@@ -4,7 +4,7 @@ SUBDIRS = mme hss sgw pgw
 
 noinst_LTLIBRARIES = libmme.la libhss.la libsgw.la libpgw.la libepc.la
 
-COMMON_SOURCES = init.c
+COMMON_SOURCES = init.c config.c
 COMMON_INCLUDES = app.h
 
 libmme_la_SOURCES = $(COMMON_INCLUDES)

src/app.h

@@ -8,25 +8,28 @@
 extern "C" {
 #endif /* __cplusplus */
 
+CORE_DECLARE(status_t) app_initialize(char *config_path, char *log_path);
+CORE_DECLARE(void) app_terminate(void);
+
 CORE_DECLARE(status_t) app_will_initialize(char *config_path, char *log_path);
 CORE_DECLARE(status_t) app_did_initialize(char *config_path, char *log_path);
-CORE_DECLARE_NONSTD(void) app_will_terminate(void);
-CORE_DECLARE_NONSTD(void) app_did_terminate(void);
+CORE_DECLARE(void) app_will_terminate(void);
+CORE_DECLARE(void) app_did_terminate(void);
 
-CORE_DECLARE(status_t) app_initialize(char *config_path, char *log_path);
-CORE_DECLARE_NONSTD(void) app_terminate(void);
+CORE_DECLARE(status_t) config_initialize(char *config_path);
+CORE_DECLARE(void) config_terminate(void);
 
 CORE_DECLARE(status_t) mme_initialize();
-CORE_DECLARE_NONSTD(void) mme_terminate(void);
+CORE_DECLARE(void) mme_terminate(void);
 
 CORE_DECLARE(status_t) hss_initialize();
-CORE_DECLARE_NONSTD(void) hss_terminate(void);
+CORE_DECLARE(void) hss_terminate(void);
 
 CORE_DECLARE(status_t) sgw_initialize();
-CORE_DECLARE_NONSTD(void) sgw_terminate(void);
+CORE_DECLARE(void) sgw_terminate(void);
 
 CORE_DECLARE(status_t) pgw_initialize();
-CORE_DECLARE_NONSTD(void) pgw_terminate(void);
+CORE_DECLARE(void) pgw_terminate(void);
 
 #ifdef __cplusplus
 }

src/config.c

@@ -0,0 +1,46 @@
+#define TRACE_MODULE _config
+
+#include "core_file.h"
+#include "core_debug.h"
+
+#include "app.h"
+
+#define MAX_CONFIG_FILE_SIZE 1024
+#define MAX_JSMN_TOKEN_SIZE 128
+#define DEFAULT_CONFIG_PATH SYSCONFDIR PACKAGE ".conf"
+
+status_t config_initialize(char *config_path)
+{
+    status_t rv;
+    size_t nbytes = MAX_CONFIG_FILE_SIZE;
+    char str[MAX_CONFIG_FILE_SIZE+1];
+    file_t *file;
+
+    char *path = config_path;
+    if (path == NULL) path = DEFAULT_CONFIG_PATH;
+
+    rv = file_open(&file, path, FILE_READ, FILE_OS_DEFAULT);
+    if (rv != CORE_OK) 
+    {
+        d_fatal("Can't open configuration file '%s' (errno = %d, %s)", 
+                path, rv, core_strerror(rv, str, MAX_CONFIG_FILE_SIZE));
+        return rv;
+    }
+
+    rv = file_read(file, str, &nbytes);
+    if (rv != CORE_OK) 
+    {
+        d_fatal("Can't read configuration file '%s' (errno = %d, %s)", 
+                path, rv, core_strerror(rv, str, MAX_CONFIG_FILE_SIZE));
+        return rv;
+    }
+    str[nbytes-1] = 0;
+
+    file_close(file);
+
+    return CORE_OK;
+}
+
+void config_terminate(void)
+{
+}

src/epc.c

@@ -15,10 +15,11 @@ status_t app_initialize(char *config_path, char *log_path)
     status_t rv;
     semaphore_id semaphore;
 
-    app_will_initialize(config_path, log_path);
+    rv = app_will_initialize(config_path, log_path);
+    if (rv != CORE_OK) return rv;
 
     rv = semaphore_create(&semaphore, 0);
-    d_assert(rv == CORE_OK, return -1, "semaphore_create() failed");
+    d_assert(rv == CORE_OK, return rv, "semaphore_create() failed");
 
     hss_pid = fork();
     d_assert(hss_pid >= 0, _exit(EXIT_FAILURE), "fork() failed");
@@ -51,7 +52,8 @@ status_t app_initialize(char *config_path, char *log_path)
     rv = semaphore_post(semaphore);
     d_assert(rv == CORE_OK, return -1, "semaphore_post() failed");
 
-    app_did_initialize(config_path, log_path);
+    rv = app_did_initialize(config_path, log_path);
+    if (rv != CORE_OK) return rv;
 
     return CORE_OK;
 }

src/init.c

@@ -17,12 +17,12 @@ void *THREAD_FUNC net_main(thread_id id, void *data);
 
 status_t app_will_initialize(char *config_path, char *log_path)
 {
+    status_t rv;
+
     core_initialize();
 
-    if (config_path)
-    {
-        /* TODO */
-    }
+    rv = config_initialize(config_path);
+    if (rv != CORE_OK) return rv;
 
     if (log_path)
     {
@@ -52,6 +52,7 @@ void app_did_terminate(void)
 {
     core_kill(logger_pid, SIGTERM);
 
+    config_terminate();
     core_terminate();
 }
 

support/nextepc.conf

@@ -0,0 +1,2 @@
+
+