Changeset 2583

Timestamp:

11/19/2011 06:22:41 PM (18 months ago)

Author:

dburgess

Message:

Brining A3/A8 into the sipauthserve public release.

Files:

• CommonLibs/trunk/Logger.cpp (modified) (2 diffs)
• CommonLibs/trunk/Logger.h (modified) (2 diffs)
• openbts/trunk/CommonLibs/Logger.cpp (modified) (2 diffs)
• openbts/trunk/CommonLibs/Logger.h (modified) (2 diffs)
• subscriberRegistry/features/a3a8 (added)
• subscriberRegistry/features/a3a8/Makefile (added)
• subscriberRegistry/features/a3a8/SubscriberRegistry.cpp (added)
• subscriberRegistry/features/a3a8/SubscriberRegistry.h (added)
• subscriberRegistry/trunk/SubscriberRegistry.cpp (modified) (1 diff)

CommonLibs/trunk/Logger.cpp

@@ -151 +151 @@
 Log::~Log()
 {
+        if (mDummyInit) return;
         // Anything at or above LOG_CRIT is an "alarm".
         // Save alarms in the local list and echo them to stderr.
@@ -160 +161 @@
         // So just log.
         syslog(mPriority, "%s", mStream.str().c_str());
+}
+
+
+Log::Log(const char* name, const char* level, int facility)
+{
+        mDummyInit = true;
+        gLogInit(name, level, facility);
 }
 

CommonLibs/trunk/Logger.h

@@ -41 +41 @@
         Log(LOG_##level).get() << pthread_self() \
         << " " __FILE__  ":"  << __LINE__ << ":" << __FUNCTION__ << ": "
+
+#ifdef NDEBUG
+#define LOG(wLevel) \
+        if (LOG_##wLevel!=LOG_DEBUG && gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel)
+#else
 #define LOG(wLevel) \
         if (gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel)
+#endif
+
+
 #define OBJLOG(wLevel) \
-        if (gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel) << "obj: " << this << ' '
+        LOG(wLevel) << "obj: " << this << ' '
 
 #define LOG_ASSERT(x) { if (!(x)) LOG(EMERG) << "assertion " #x " failed"; } assert(x);
@@ -67 +75 @@
         std::ostringstream mStream;             ///< This is where we buffer up the log entry.
         int mPriority;                                  ///< Priority of current repot.
+        bool mDummyInit;
 
         public:
 
         Log(int wPriority)
-                :mPriority(wPriority)
+                :mPriority(wPriority), mDummyInit(false)
         { }
+
+        Log(const char* name, const char* level=NULL, int facility=LOG_USER);
 
         // Most of the work is in the desctructor.

openbts/trunk/CommonLibs/Logger.cpp

@@ -151 +151 @@
 Log::~Log()
 {
+        if (mDummyInit) return;
         // Anything at or above LOG_CRIT is an "alarm".
         // Save alarms in the local list and echo them to stderr.
@@ -160 +161 @@
         // So just log.
         syslog(mPriority, "%s", mStream.str().c_str());
+}
+
+
+Log::Log(const char* name, const char* level, int facility)
+{
+        mDummyInit = true;
+        gLogInit(name, level, facility);
 }
 

openbts/trunk/CommonLibs/Logger.h

@@ -41 +41 @@
         Log(LOG_##level).get() << pthread_self() \
         << " " __FILE__  ":"  << __LINE__ << ":" << __FUNCTION__ << ": "
+
+#ifdef NDEBUG
+#define LOG(wLevel) \
+        if (LOG_##wLevel!=LOG_DEBUG && gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel)
+#else
 #define LOG(wLevel) \
         if (gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel)
+#endif
+
+
 #define OBJLOG(wLevel) \
-        if (gGetLoggingLevel(__FILE__)>=LOG_##wLevel) _LOG(wLevel) << "obj: " << this << ' '
+        LOG(wLevel) << "obj: " << this << ' '
 
 #define LOG_ASSERT(x) { if (!(x)) LOG(EMERG) << "assertion " #x " failed"; } assert(x);
@@ -67 +75 @@
         std::ostringstream mStream;             ///< This is where we buffer up the log entry.
         int mPriority;                                  ///< Priority of current repot.
+        bool mDummyInit;
 
         public:
 
         Log(int wPriority)
-                :mPriority(wPriority)
+                :mPriority(wPriority), mDummyInit(false)
         { }
+
+        Log(const char* name, const char* level=NULL, int facility=LOG_USER);
 
         // Most of the work is in the desctructor.

subscriberRegistry/trunk/SubscriberRegistry.cpp

@@ -145 +145 @@
                 "ki                    varchar(33) default '', "
                 "kc                    varchar(33) default '', "
-                "prepaid               int(1) DEFAULT 0 not null, "
-                "secondsRemaining      int(11) DEFAULT 0 not null, "
                 "RRLPSupported         int(1) default 1 not null, "
                 "regTime               INTEGER default 0 NOT NULL, " // Unix time of most recent registration