merged in commercial subscriberRegistry

.gitmodules

@@ -6,3 +6,7 @@
 	path = sqlite3
 	url = [email protected]:RangeNetworks/sqlite3.git
 	branch = master
+[submodule "NodeManager"]
+	path = NodeManager
+	url = [email protected]:RangeNetworks/NodeManager.git
+	branch = 4.0

COPYING

@@ -693,14 +693,6 @@ Interaction; Use with the GNU General Public License").  This exemption of
 interfaces other than the GSM air interface from the requirements of Section 13
 is an additional permission granted to you.  
 
-2.  GSM "A5" cipher stream generation libraries
-
-Notwithstanding any other provision of this License, you have
-permission to link the Program with GSM "A5" cipher-stream generation
-libraries provided under any license that allows redistribution of
-those libraries in binary form, provided that the function of any such
-library is limited to the generation of cipher-steam bits.
-
 
 Non-Permissive Terms Supplementing The License
 
@@ -712,9 +704,11 @@ license does not include the right to use the OpenBTS trademark in commerce.
 This additional non-permissive term is consistent with Section 7 of the AGPLv3
 license.
 
+
 END OF ADDITIONAL TERMS
 
 
+
 How to comply with Section 13 of the AGPLv3 license.
 
 The recommended method for compliance with Section 13 of the AGPLv3 license is

Globals/Globals.cpp

@@ -0,0 +1,25 @@
+/**@file Global system parameters. */
+/*
+* Copyright 2013 Range Networks, Inc.
+*
+* This software is distributed under multiple licenses;
+* see the COPYING file in the main directory for licensing
+* information for this specific distribuion.
+*
+* This use of this software may be subject to additional restrictions.
+* See the LEGAL file in the main directory for details.
+
+    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.
+
+*/
+
+/*
+	This file keeps global system parameters.
+*/
+
+#include "config.h"
+#include <Globals.h>
+
+const char *gVersionString = "release " VERSION " built " __DATE__ " rev" SVN_REV " ";

Globals/Globals.h

@@ -0,0 +1,36 @@
+/**@file Global system parameters. */
+/*
+* Copyright 2013 Range Networks, Inc.
+*
+* This software is distributed under multiple licenses;
+* see the COPYING file in the main directory for licensing
+* information for this specific distribuion.
+*
+* This use of this software may be subject to additional restrictions.
+* See the LEGAL file in the main directory for details.
+
+    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.
+
+*/
+
+/*
+	This file keeps global system parameters.
+*/
+
+#ifndef GLOBALS_H
+#define GLOBALS_H
+
+#include <Configuration.h>
+
+
+/**
+	Just about everything goes into the configuration table.
+	This should be defined in the main body of the top-level application.
+*/
+extern ConfigurationTable gConfig;
+
+/** The version string. */
+extern const char *gVersionString;
+#endif

Globals/Makefile.am

@@ -0,0 +1,33 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This software is distributed under the terms of the GNU Public License.
+# See the COPYING file in the main directory for details.
+#
+# 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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, see <http://www.gnu.org/licenses/>.
+#
+
+include $(top_srcdir)/Makefile.common
+
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
+AM_CXXFLAGS = -Wall
+
+noinst_LTLIBRARIES = libglobals.la
+
+libglobals_la_SOURCES = Globals.cpp
+
+noinst_PROGRAMS = 
+
+noinst_HEADERS = \
+	Globals.h