Merge branch 'master' of https://github.com/resiprocate/resiprocate

# Conflicts: # resip/stack/resiprocate_14_0.vcxproj.filters
resiprocate · Oct 28, 2016 · 6d8cdb8 · 6d8cdb8
2 parents 97f591c + ef8f9e9
commit 6d8cdb8
Show file tree

Hide file tree

Showing 36 changed files with 881 additions and 19 deletions.
diff --git a/apps/telepathy/Connection.cxx b/apps/telepathy/Connection.cxx
@@ -489,6 +489,12 @@ tr::Connection::onMessageReceived(const resip::SipMessage& message)
       return;
    }
 
+   if ( message.header(h_ContentType) != Mime("text", "plain") )
+   {
+      qWarning() << "Ignoring a message of type " << message.header(h_ContentType).type().c_str() << "/" << message.header(h_ContentType).subType().c_str();
+      return;
+   }
+
    TextChannelPtr textChannel = TextChannelPtr::dynamicCast(channel->interface(TP_QT_IFACE_CHANNEL_TYPE_TEXT));
 
    if ( !textChannel )

diff --git a/build/travis/configure b/build/travis/configure
@@ -9,7 +9,6 @@ set -e
   --with-mysql \
   --with-postgresql \
   --with-apps \
-  --with-ichat-gw \
   --enable-dtls \
   --enable-ipv6 \
   --with-radcli \

diff --git a/repro/ReproRunner.cxx b/repro/ReproRunner.cxx
@@ -34,6 +34,7 @@
 #include "resip/stack/SipStack.hxx"
 #include "resip/stack/Compression.hxx"
 #include "resip/stack/EventStackThread.hxx"
+#include "resip/stack/HEPSipMessageLoggingHandler.hxx"
 #include "resip/stack/InteropHelper.hxx"
 #include "resip/stack/ConnectionManager.hxx"
 #include "resip/stack/WsCookieContextFactory.hxx"
@@ -785,7 +786,19 @@ ReproRunner::createSipStack()
    mSipStack->setExternalStatsHandler(this);
 
    // Set Transport SipMessage Logging Handler - if enabled
-   if(mProxyConfig->getConfigBool("EnableSipMessageLogging", false))
+   Data captureHost;
+   mProxyConfig->getConfigValue("CaptureHost", captureHost);
+   if(!captureHost.empty())
+   {
+      int capturePort = mProxyConfig->getConfigInt("CapturePort", 9060);
+      int captureAgentID = mProxyConfig->getConfigInt("CaptureAgentID", 2001);
+#ifndef WIN32 // Does not currently build on windows - TODO
+      mSipStack->setTransportSipMessageLoggingHandler(SharedPtr<HEPSipMessageLoggingHandler>(new HEPSipMessageLoggingHandler(captureHost, capturePort, captureAgentID)));
+#else
+      CritLog(<< "HOMER Capture support is not currently implemented for Windows");
+#endif
+   }
+   else if(mProxyConfig->getConfigBool("EnableSipMessageLogging", false))
    {
        mSipStack->setTransportSipMessageLoggingHandler(SharedPtr<ReproSipMessageLoggingHandler>(new ReproSipMessageLoggingHandler));
    }

diff --git a/repro/monkeys/AmIResponsible.hxx b/repro/monkeys/AmIResponsible.hxx
@@ -15,7 +15,7 @@ namespace repro
 
       virtual processor_action_t process(RequestContext &);
 
-  private:
+  protected:
       bool mAlwaysAllowRelaying;
   };
 }

diff --git a/repro/monkeys/CertificateAuthenticator.hxx b/repro/monkeys/CertificateAuthenticator.hxx
@@ -30,7 +30,7 @@ namespace repro
       virtual processor_action_t process(RequestContext &);
       virtual void dump(EncodeStream &os) const;
 
-    private:
+    protected:
       bool isTrustedSource(const std::list<resip::Data>& peerNames);
       bool authorizedForThisIdentity(RequestContext& context, const std::list<resip::Data>& peerNames, resip::Uri &fromUri);
 

diff --git a/repro/monkeys/CookieAuthenticator.hxx b/repro/monkeys/CookieAuthenticator.hxx
@@ -22,7 +22,7 @@ namespace repro
       virtual processor_action_t process(RequestContext &);
       virtual void dump(EncodeStream &os) const;
 
-    private:
+    protected:
       std::auto_ptr<resip::ExtensionHeader> mWsCookieExtraHeader;
 
       bool cookieUriMatch(const resip::Uri &first, const resip::Uri &second);

diff --git a/repro/monkeys/DigestAuthenticator.hxx b/repro/monkeys/DigestAuthenticator.hxx
@@ -32,7 +32,7 @@ namespace repro
       virtual resip::Data getRealm(RequestContext &);
       virtual bool isMyRealm(RequestContext &, const resip::Data& realm);
 
-    private:
+    protected:
       Dispatcher* mAuthRequestDispatcher;
       resip::Data mStaticRealm;
       bool mNoIdentityHeaders;

diff --git a/repro/monkeys/IsTrustedNode.hxx b/repro/monkeys/IsTrustedNode.hxx
@@ -20,7 +20,7 @@ namespace repro
 
       virtual processor_action_t process(RequestContext &);
 
-  private:
+     protected:
        AclStore& mAclStore;
   };
 }

diff --git a/repro/monkeys/LocationServer.hxx b/repro/monkeys/LocationServer.hxx
@@ -23,7 +23,7 @@ namespace repro
 
       virtual processor_action_t process(RequestContext &);
 
-    private:
+    protected:
       resip::RegistrationPersistenceManager& mStore;
       Dispatcher* mUserInfoDispatcher;
   };

diff --git a/repro/monkeys/OutboundTargetHandler.hxx b/repro/monkeys/OutboundTargetHandler.hxx
@@ -15,7 +15,7 @@ class OutboundTargetHandler : public Processor
 
       virtual processor_action_t process(RequestContext &);
 
-    private:
+   protected:
       resip::RegistrationPersistenceManager& mRegStore;
 };
 

diff --git a/repro/monkeys/SimpleStaticRoute.hxx b/repro/monkeys/SimpleStaticRoute.hxx
@@ -16,7 +16,7 @@ class SimpleStaticRoute: public Processor
 
       virtual processor_action_t process(RequestContext &);
 
-   private:
+   protected:
       resip::NameAddrs mRouteSet;
 };
 

diff --git a/repro/monkeys/StaticRoute.hxx b/repro/monkeys/StaticRoute.hxx
@@ -16,7 +16,7 @@ class StaticRoute: public Processor
 
       virtual processor_action_t process(RequestContext &);
 
-   private:
+   protected:
       RouteStore& mRouteStore;
       bool mNoChallenge;
       bool mParallelForkStaticRoutes;

diff --git a/repro/repro.config b/repro/repro.config
@@ -32,8 +32,23 @@ LogFileMaxBytes = 5242880
 
 # Enable INFO level SIP Message Logging - outputs all SIP messages
 # sent and/or received to log file in an easy to read format
+# This option has no effect if logging to HOMER is enabled
+# by setting CaptureHost
 EnableSipMessageLogging = false
 
+# Specify the HOMER SIP capture server hostname
+# If CaptureHost is commented/not defined, there is no default value and
+# repro doesn't attempt to send any HEP packets.
+#CaptureHost = localhost
+
+# Specify the HOMER SIP capture server UDP port
+# If not defined, the default value, 9060, is used
+#CapturePort = 9060
+
+# Specify the HOMER Capture Agent ID
+# The default value is 2001
+CaptureAgentID = 2001
+
 ########################################################
 # Transport settings
 ########################################################

diff --git a/resip/stack/Connection.cxx b/resip/stack/Connection.cxx
@@ -541,7 +541,17 @@ Connection::processPollEvent(FdPollEventMask mask) {
    }
 }
 
-bool Connection::isServer()const{ return mIsServer; }
+bool 
+Connection::isServer() const
+{ 
+   return mIsServer; 
+}
+
+void 
+Connection::invokeAfterSocketCreationFunc() const
+{
+    mTransport->callSocketFunc(getSocket());
+}
 
 /* ====================================================================
  * The Vovida Software License, Version 1.0 

diff --git a/resip/stack/Connection.hxx b/resip/stack/Connection.hxx
@@ -115,6 +115,8 @@ class Connection : public ConnectionBase,
       /* callback method of FdPollItemIf */
       virtual void processPollEvent(FdPollEventMask mask);
 
+      virtual void invokeAfterSocketCreationFunc() const;
+
    private:
       ConnectionManager& getConnectionManager() const;
       void removeFrontOutstandingSend();

diff --git a/resip/stack/ConnectionManager.cxx b/resip/stack/ConnectionManager.cxx
@@ -462,6 +462,15 @@ ConnectionManager::setPollGrp(FdPollGrp *grp)
     mPollGrp = grp;
 }
 
+void 
+ConnectionManager::invokeAfterSocketCreationFunc() const
+{
+    for (AddrMap::const_iterator it = mAddrMap.begin(); it != mAddrMap.end(); it++)
+    {
+        it->second->invokeAfterSocketCreationFunc();
+    }
+}
+
 /* ====================================================================
  * The Vovida Software License, Version 1.0 
  * 

diff --git a/resip/stack/ConnectionManager.hxx b/resip/stack/ConnectionManager.hxx
@@ -47,6 +47,8 @@ class ConnectionManager
       void buildFdSet(FdSet& fdset);
       void process(FdSet& fdset);
 
+      virtual void invokeAfterSocketCreationFunc() const;
+
    private:
       void addToWritable(Connection* conn); // add the specified conn to end
       void removeFromWritable(Connection* conn); // remove the current mWriteMark