r2721 - in trunk/libmsip/include: . libmsip
erik at minisip.org
erik at minisip.org
Wed Aug 23 06:48:07 CEST 2006
Author: erik
Date: 2006-08-23 06:48:05 +0200 (Wed, 23 Aug 2006)
New Revision: 2721
Modified:
trunk/libmsip/include/Makefile.am
trunk/libmsip/include/libmsip/SipCommandDispatcher.h
trunk/libmsip/include/libmsip/SipTransaction.h
trunk/libmsip/include/libmsip/SipTransactionInviteClient.h
trunk/libmsip/include/libmsip/SipTransactionInviteServer.h
trunk/libmsip/include/libmsip/SipTransactionInviteServerUA.h
trunk/libmsip/include/libmsip/SipTransactionNonInviteClient.h
trunk/libmsip/include/libmsip/SipTransactionNonInviteServer.h
Log:
* Transaction layer state machines are local to libmsip:
- Do not install their header files
- They are not part of the API (no LIBMSIP_API)
Note: you need to re-do "bootstrap" since I changed
include/Makefile.am.
Note: The "old" header files (that we no longer install)
will be installed on your computer until you remove them
manually. (this should cause no problems even if you do not
remove them)
Modified: trunk/libmsip/include/Makefile.am
===================================================================
--- trunk/libmsip/include/Makefile.am 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/Makefile.am 2006-08-23 04:48:05 UTC (rev 2721)
@@ -1,11 +1,10 @@
pkginclude_HEADERS = libmsip/SipHeader.h \
libmsip/SipStack.h \
libmsip/SipLayerDialog.h \
- libmsip/SipLayerTransaction.h \
+ libmsip/SipUtils.h \
+ libmsip/SipTimers.h \
libmsip/SipHeaderAccept.h \
libmsip/SipHeaderAcceptContact.h \
- libmsip/SipUtils.h \
- libmsip/SipTimers.h \
libmsip/SipHeaderAuthorization.h \
libmsip/SipHeaderCSeq.h \
libmsip/SipHeaderCallID.h \
@@ -35,7 +34,6 @@
libmsip/SipHeaderWarning.h \
libmsip/SipHeaderReferTo.h \
libmsip/SipDialogConfig.h \
- libmsip/SipCommandDispatcher.h \
libmsip/SipMessageContent.h \
libmsip/SipMessageContentIM.h \
libmsip/SipMessageContentFactory.h \
@@ -46,22 +44,24 @@
libmsip/SipUri.h \
libmsip/SipException.h \
libmsip/SipTransactionUtils.h \
- libmsip/SipTransaction.h \
- libmsip/SipTransactionNonInviteClient.h \
- libmsip/SipTransactionNonInviteServer.h \
- libmsip/SipTransactionInviteClient.h \
- libmsip/SipTransactionInviteServer.h \
- libmsip/SipTransactionInviteServerUA.h \
libmsip/SipMessage.h \
libmsip/SipResponse.h \
libmsip/SipRequest.h \
libmsip/SipDialog.h \
libmsip/SipDialogRegister.h \
+ libmsip/SipAuthenticationDigest.h \
+ libmsip/SipCommandDispatcher.h \
libmsip/SipDialogManagement.h \
- libmsip/SipAuthenticationDigest.h \
+ libmsip/SipLayerTransaction.h \
+ libmsip/SipTransaction.h \
libmsip/libmsip_config.h
-noinst_HEADERS = config.h
+noinst_HEADERS = libmsip/SipTransactionNonInviteClient.h \
+ libmsip/SipTransactionNonInviteServer.h \
+ libmsip/SipTransactionInviteClient.h \
+ libmsip/SipTransactionInviteServer.h \
+ libmsip/SipTransactionInviteServerUA.h \
+ config.h
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
$(srcdir)/compilation_config.h.in \
Modified: trunk/libmsip/include/libmsip/SipCommandDispatcher.h
===================================================================
--- trunk/libmsip/include/libmsip/SipCommandDispatcher.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipCommandDispatcher.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -35,7 +35,6 @@
#include<libmutil/MemObject.h>
#include<libmutil/minilist.h>
#include<libmsip/SipTransaction.h>
-//#include<libmsip/SipDialog.h>
#include<libmsip/SipLayerDialog.h>
#include<libmsip/SipLayerTransaction.h>
#include<libmsip/SipLayerTransport.h>
Modified: trunk/libmsip/include/libmsip/SipTransaction.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransaction.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransaction.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -134,10 +134,10 @@
};
-class LIBMSIP_API SipTransactionClient: public SipTransaction{
+//All sub-classes of SipTransaction are local to libmsip
+class SipTransactionClient: public SipTransaction{
public:
SipTransactionClient(MRef<SipStack*> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &branch,
@@ -145,10 +145,9 @@
~SipTransactionClient();
};
-class LIBMSIP_API SipTransactionServer: public SipTransaction{
+class SipTransactionServer: public SipTransaction{
public:
SipTransactionServer(MRef<SipStack*> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &branch,
Modified: trunk/libmsip/include/libmsip/SipTransactionInviteClient.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransactionInviteClient.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransactionInviteClient.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -57,10 +57,9 @@
This is a base class for an INVITE transaction client UA
(the handling of 2xx responses changes).
*/
-class LIBMSIP_API SipTransactionInviteClient: public SipTransactionClient{
+class SipTransactionInviteClient: public SipTransactionClient{
public:
SipTransactionInviteClient(MRef<SipStack*> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &callid);
Modified: trunk/libmsip/include/libmsip/SipTransactionInviteServer.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransactionInviteServer.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransactionInviteServer.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -57,10 +57,9 @@
This is a base class for an INVITE transaction server UA
(the handling of 2xx responses changes).
*/
-class LIBMSIP_API SipTransactionInviteServer : public SipTransactionServer{
+class SipTransactionInviteServer : public SipTransactionServer{
public:
SipTransactionInviteServer(MRef<SipStack *> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &branch,
Modified: trunk/libmsip/include/libmsip/SipTransactionInviteServerUA.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransactionInviteServerUA.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransactionInviteServerUA.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -57,10 +57,9 @@
All transitions are the same as for the parent class, except for
a5, which is substituted by a1001.
*/
-class LIBMSIP_API SipTransactionInviteServerUA: public SipTransactionInviteServer{
+class SipTransactionInviteServerUA: public SipTransactionInviteServer{
public:
SipTransactionInviteServerUA(MRef<SipStack*> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &branch,
Modified: trunk/libmsip/include/libmsip/SipTransactionNonInviteClient.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransactionNonInviteClient.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransactionNonInviteClient.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -55,10 +55,9 @@
There is a transition from any state into TERMINATED, defined in
the base class SipTransaction::a1000_xxxx()
*/
-class LIBMSIP_API SipTransactionNonInviteClient: public SipTransactionClient{
+class SipTransactionNonInviteClient: public SipTransactionClient{
public:
SipTransactionNonInviteClient(MRef<SipStack *> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &callid);
Modified: trunk/libmsip/include/libmsip/SipTransactionNonInviteServer.h
===================================================================
--- trunk/libmsip/include/libmsip/SipTransactionNonInviteServer.h 2006-08-23 04:32:03 UTC (rev 2720)
+++ trunk/libmsip/include/libmsip/SipTransactionNonInviteServer.h 2006-08-23 04:48:05 UTC (rev 2721)
@@ -54,10 +54,9 @@
There is a transition from any state into TERMINATED, defined in
the base class SipTransaction::a1000_xxxx()
*/
-class LIBMSIP_API SipTransactionNonInviteServer: public SipTransactionServer{
+class SipTransactionNonInviteServer: public SipTransactionServer{
public:
SipTransactionNonInviteServer(MRef<SipStack*> stack,
- //MRef<SipDialog*> d,
int seq_no,
const std::string &cSeqMethod,
const std::string &branch,
More information about the Minisip-devel
mailing list