[reSIProcate-users] Small resip/dum/test fixes (newbie)
As a newbie, I would like to suggest the following fixes to build the DUM test
programs:
diff -u test/Makefile test.fix/Makefile
--- test/Makefile 2008-05-08 01:30:00.000000000 +0200
+++ test.fix/Makefile 2009-02-18 10:06:35.000000000 +0100
@@ -8,9 +8,15 @@
TARGET_LIBRARY =
#testDumTimer.cxx
-TESTPROGRAMS += basicRegister.cxx BasicCall.cxx testSMIMEMessage.cxx
basicMessage.cxx testSMIMEInvite.cxx
+TESTPROGRAMS += basicRegister.cxx BasicCall.cxx basicMessage.cxx
+
+TESTPROGRAMS += treg.cxx
+
+ifeq ($(USE_SSL),yes)
+TESTPROGRAMS += testSMIMEMessage.cxx testSMIMEInvite.cxx
+TESTPROGRAMS += limpc.cxx
+endif
-TESTPROGRAMS += limpc.cxx treg.cxx
SRC = CommandLineParser.cxx UserAgent.cxx
SRC += RegEventClient.cxx
diff -u test/RegEventClient.cxx test.fix/RegEventClient.cxx
--- test/RegEventClient.cxx 2009-02-18 09:39:39.000000000 +0100
+++ test.fix/RegEventClient.cxx 2009-02-18 09:42:05.000000000 +0100
@@ -37,15 +37,15 @@
return new AddAor(mClient, mAor);
}
-std::ostream&
-AddAor::encode(std::ostream& strm) const
+resip::ResipFastOStream&
+AddAor::encode(resip::ResipFastOStream& strm) const
{
strm << "Add RegEvent watcher " << mAor;
return strm;
}
-std::ostream&
-AddAor::encodeBrief(std::ostream& strm) const
+resip::ResipFastOStream&
+AddAor::encodeBrief(resip::ResipFastOStream& strm) const
{
return encode(strm);
}
diff -u test/RegEventClient.hxx test.fix/RegEventClient.hxx
--- test/RegEventClient.hxx 2009-02-18 09:39:22.000000000 +0100
+++ test.fix/RegEventClient.hxx 2009-02-18 09:41:49.000000000 +0100
@@ -93,9 +93,9 @@
virtual void executeCommand();
virtual resip::Message* clone() const;
- virtual std::ostream& encode(std::ostream&) const;
- virtual std::ostream& encodeBrief(std::ostream&) const;
-
+ virtual resip::ResipFastOStream& encode(resip::ResipFastOStream&) const;
+ virtual resip::ResipFastOStream& encodeBrief(resip::ResipFastOStream&)
const;
+
private:
RegEventClient& mClient;
const resip::Uri mAor;
diff -u test/UserAgent.hxx test.fix/UserAgent.hxx
--- test/UserAgent.hxx 2009-02-18 09:38:43.000000000 +0100
+++ test.fix/UserAgent.hxx 2009-02-18 09:40:47.000000000 +0100
@@ -105,16 +105,16 @@
return new EndInviteSessionCommand(mHandle);
}
- virtual std::ostream& encode(std::ostream& str) const
+ virtual EncodeStream& encode(EncodeStream& str) const
{
return str << "EndInviteSessionCommand";
}
- virtual std::ostream& encodeBrief(std::ostream& str) const
+ virtual EncodeStream& encodeBrief(EncodeStream& str) const
{
return encode(str);
}
-
+
private:
InviteSessionHandle mHandle;
};
Common subdirectories: test/curlHttp and test.fix/curlHttp
diff -u test/testSMIMEInvite.cxx test.fix/testSMIMEInvite.cxx
--- test/testSMIMEInvite.cxx 2008-09-23 10:30:37.000000000 +0200
+++ test.fix/testSMIMEInvite.cxx 2009-02-18 10:06:15.000000000 +0100
@@ -25,6 +25,8 @@
#ifdef WIN32
#include "resip/stack/ssl/WinSecurity.hxx"
+#else
+#include "resip/stack/ssl/Security.hxx"
#endif
#include "TestDumHandlers.hxx"
diff -u test/testSMIMEMessage.cxx test.fix/testSMIMEMessage.cxx
--- test/testSMIMEMessage.cxx 2008-09-23 10:30:37.000000000 +0200
+++ test.fix/testSMIMEMessage.cxx 2009-02-18 09:52:56.000000000 +0100
@@ -21,6 +21,8 @@
#ifdef WIN32
#include "resip/stack/ssl/WinSecurity.hxx"
+#else
+#include "resip/stack/ssl/Security.hxx"
#endif
#include <iostream>
In addition, testSMIME.cxx appears to be an older version of
testSMIMEMessage.cxx.
This e-mail and any attachment is for authorised use by the intended
recipient(s) only. It may contain proprietary material, confidential
information and/or be subject to legal privilege. It should not be copied,
disclosed to, retained or used by, any other party. If you are not an intended
recipient then please promptly delete this e-mail and any attachment and all
copies and inform the sender. Thank you.