Browse code

renamed the generated package to "py_sems_lib", so that it does not clash with the main module's name (py_sems).

git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@229 8eb893ce-cfd4-0310-b710-fb5ebe64c474

Raphael Coeffic authored on 16/02/2007 09:15:51
Showing 20 changed files
... ...
@@ -27,11 +27,11 @@
27 27
 #include "log.h"
28 28
 #include "AmApi.h"
29 29
 #include "AmUtils.h"
30
-#include "AmSessionScheduler.h"
30
+#include "AmMediaProcessor.h"
31 31
 #include "AmPlugIn.h"
32 32
 
33
-#include "sip/sipAPIpy_sems.h"
34
-#include "sip/sippy_semsPySemsDialog.h"
33
+#include "sip/sipAPIpy_sems_lib.h"
34
+#include "sip/sippy_sems_libPySemsDialog.h"
35 35
 
36 36
 #include <unistd.h>
37 37
 #include <pthread.h>
... ...
@@ -66,7 +66,7 @@ struct PythonGIL
66 66
 
67 67
 extern "C" {
68 68
 
69
-    static PyObject* ivr_log(PyObject*, PyObject* args)
69
+    static PyObject* py_sems_log(PyObject*, PyObject* args)
70 70
     {
71 71
 	int level;
72 72
 	char *msg;
... ...
@@ -103,7 +103,7 @@ extern "C" {
103 103
 	return Py_None;
104 104
     }
105 105
 
106
-    static PyObject* ivr_getHeader(PyObject*, PyObject* args)
106
+    static PyObject* py_sems_getHeader(PyObject*, PyObject* args)
107 107
     {
108 108
 	char* headers;
109 109
 	char* header_name;
... ...
@@ -115,9 +115,9 @@ extern "C" {
115 115
     }
116 116
 
117 117
 
118
-    static PyMethodDef ivr_methods[] = {
119
- 	{"log", (PyCFunction)ivr_log, METH_VARARGS,"Log a message using Sems' logging system"},
120
-	{"getHeader", (PyCFunction)ivr_getHeader, METH_VARARGS,"Python getHeader wrapper"},
118
+    static PyMethodDef py_sems_methods[] = {
119
+ 	{"log", (PyCFunction)py_sems_log, METH_VARARGS,"Log a message using Sems' logging system"},
120
+	{"getHeader", (PyCFunction)py_sems_getHeader, METH_VARARGS,"Python getHeader wrapper"},
121 121
 	{NULL}  /* Sentinel */
122 122
     };
123 123
 }
... ...
@@ -160,28 +160,28 @@ void PySemsFactory::import_object(PyObject* m, char* name, PyTypeObject* type)
160 160
     PyModule_AddObject(m, name, (PyObject *)type);
161 161
 }
162 162
 
163
-void PySemsFactory::import_ivr_builtins()
163
+void PySemsFactory::import_py_sems_builtins()
164 164
 {
165
-    // ivr module - start
166
-    PyImport_AddModule("ivr");
167
-    ivr_module = Py_InitModule("ivr",ivr_methods);
165
+    // py_sems module - start
166
+    PyImport_AddModule("py_sems");
167
+    py_sems_module = Py_InitModule("py_sems",py_sems_methods);
168 168
 
169 169
     // PySemsSipDialog (= AmSipDialog)
170
-    //import_object(ivr_module, "PySemsSipDialog", &PySemsSipDialogType);
170
+    //import_object(py_sems_module, "PySemsSipDialog", &PySemsSipDialogType);
171 171
 
172 172
     // PySemsDialogBase
173
-    //import_object(ivr_module,"PySemsDialogBase",&PySemsDialogBaseType);
173
+    //import_object(py_sems_module,"PySemsDialogBase",&PySemsDialogBaseType);
174 174
 
175 175
 
176 176
     // PySemsAudioFile
177
-    import_object(ivr_module,"PySemsAudioFile",&PySemsAudioFileType);
177
+    import_object(py_sems_module,"PySemsAudioFile",&PySemsAudioFileType);
178 178
 
179
-    PyModule_AddIntConstant(ivr_module, "AUDIO_READ",AUDIO_READ);
180
-    PyModule_AddIntConstant(ivr_module, "AUDIO_WRITE",AUDIO_WRITE);
181
-    // ivr module - end
179
+    PyModule_AddIntConstant(py_sems_module, "AUDIO_READ",AUDIO_READ);
180
+    PyModule_AddIntConstant(py_sems_module, "AUDIO_WRITE",AUDIO_WRITE);
181
+    // py_sems module - end
182 182
 
183 183
     // add log level for the log module
184
-    PyModule_AddIntConstant(ivr_module, "SEMS_LOG_LEVEL",log_level);
184
+    PyModule_AddIntConstant(py_sems_module, "SEMS_LOG_LEVEL",log_level);
185 185
 
186 186
     import_module("log");
187 187
     initpy_sems();
... ...
@@ -205,7 +205,7 @@ void PySemsFactory::init_python_interpreter()
205 205
 {
206 206
     Py_Initialize();
207 207
     PyEval_InitThreads();
208
-    import_ivr_builtins();
208
+    import_py_sems_builtins();
209 209
     PyEval_ReleaseLock();
210 210
 }
211 211
 
... ...
@@ -233,7 +233,7 @@ PySemsDialog* PySemsFactory::newDlg(const string& name)
233 233
 	PyErr_Print();
234 234
 	ERROR("PySemsFactory: while loading \"%s\": could not create instance\n",
235 235
 	      name.c_str());
236
-	throw AmSession::Exception(500,"Internal error in IVR plug-in.");
236
+	throw AmSession::Exception(500,"Internal error in PY_SEMS plug-in.");
237 237
 	
238 238
 	return NULL;
239 239
     }
... ...
@@ -245,7 +245,7 @@ PySemsDialog* PySemsFactory::newDlg(const string& name)
245 245
 	PyErr_Print();
246 246
 	ERROR("PySemsFactory: while loading \"%s\": could not retrieve PySemsDialog ptr.\n",
247 247
 	      name.c_str());
248
-	throw AmSession::Exception(500,"Internal error in IVR plug-in.");
248
+	throw AmSession::Exception(500,"Internal error in PY_SEMS plug-in.");
249 249
 	Py_DECREF(dlg_inst);
250 250
 
251 251
 	return NULL;
... ...
@@ -361,16 +361,16 @@ int PySemsFactory::onLoad()
361 361
     setScriptPath(cfg.getParameter("script_path"));
362 362
     init_python_interpreter();
363 363
 
364
-    DBG("** IVR compile time configuration:\n");
364
+    DBG("** PY_SEMS compile time configuration:\n");
365 365
     DBG("**     built with PYTHON support.\n");
366 366
 
367
-#ifdef IVR_WITH_TTS
367
+#ifdef PY_SEMS_WITH_TTS
368 368
     DBG("**     Text-To-Speech enabled\n");
369 369
 #else
370 370
     DBG("**     Text-To-Speech disabled\n");
371 371
 #endif
372 372
 
373
-    DBG("** IVR run time configuration:\n");
373
+    DBG("** PY_SEMS run time configuration:\n");
374 374
     DBG("**     script path:         \'%s\'\n", script_path.c_str());
375 375
 
376 376
     regex_t reg;
... ...
@@ -19,17 +19,17 @@
19 19
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
20 20
  */
21 21
 
22
-#ifndef _IVR_H_
23
-#define _IVR_H_
22
+#ifndef _PY_SEMS_H_
23
+#define _PY_SEMS_H_
24 24
 
25
-#define MOD_NAME "ivr"
25
+#define MOD_NAME "py_sems"
26 26
 
27 27
 #include <Python.h>
28 28
 
29 29
 #include "AmB2BSession.h"
30 30
 #include "AmPlaylist.h"
31 31
 
32
-#ifdef IVR_WITH_TTS
32
+#ifdef PY_SEMS_WITH_TTS
33 33
 #include "flite.h"
34 34
 #endif
35 35
 
... ...
@@ -65,7 +65,7 @@ struct PySemsScriptDesc
65 65
 
66 66
 class PySemsFactory: public AmSessionFactory
67 67
 {
68
-    PyObject* ivr_module;
68
+    PyObject* py_sems_module;
69 69
     string script_path;
70 70
     string default_script;
71 71
 
... ...
@@ -74,7 +74,7 @@ class PySemsFactory: public AmSessionFactory
74 74
     AmDynInvokeFactory* user_timer_fact;
75 75
 
76 76
     void init_python_interpreter();
77
-    void import_ivr_builtins();
77
+    void import_py_sems_builtins();
78 78
 
79 79
     void import_module(const char* modname);
80 80
     void import_object(PyObject* m, 
... ...
@@ -1,6 +1,6 @@
1
-TARGET = py_sems.so
2
-OFILES = sippy_semscmodule.o sippy_semsPySemsDialog.o sippy_semsAmSipDialog.o sippy_semsAmSipReply.o sippy_semsAmSipRequest.o sippy_semsstring.o
3
-HFILES = sipAPIpy_sems.h sippy_semsPySemsDialog.h sippy_semsAmSipDialog.h sippy_semsAmSipReply.h sippy_semsAmSipRequest.h sippy_semsstring.h 
1
+TARGET = py_sems_lib.so
2
+OFILES = sippy_sems_libcmodule.o sippy_sems_libPySemsDialog.o sippy_sems_libAmSipDialog.o sippy_sems_libAmSipReply.o sippy_sems_libAmSipRequest.o sippy_sems_libstring.o
3
+HFILES = sipAPIpy_sems_lib.h sippy_sems_libPySemsDialog.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h 
4 4
 
5 5
 CC = gcc
6 6
 CXX = g++
... ...
@@ -39,9 +39,9 @@ install: $(TARGET)
39 39
 
40 40
 clean:
41 41
 	-rm -f $(TARGET)
42
-	-rm -f sippy_semscmodule.o
43
-	-rm -f sippy_semsPySemsDialog.o
44
-	-rm -f sippy_semsAmSipDialog.o
45
-	-rm -f sippy_semsAmSipReply.o
46
-	-rm -f sippy_semsAmSipRequest.o
47
-	-rm -f sippy_semsstring.o
42
+	-rm -f sippy_sems_libcmodule.o
43
+	-rm -f sippy_sems_libPySemsDialog.o
44
+	-rm -f sippy_sems_libAmSipDialog.o
45
+	-rm -f sippy_sems_libAmSipReply.o
46
+	-rm -f sippy_sems_libAmSipRequest.o
47
+	-rm -f sippy_sems_libstring.o
... ...
@@ -21,13 +21,13 @@ public:
21 21
 
22 22
     virtual void onInvite(const AmSipRequest& /* req */);
23 23
     virtual void onSessionStart(const AmSipRequest& /* req */);
24
-    virtual void onBye(const AmSipRequest& /* req */);
25 24
     virtual void onCancel();
26 25
 
26
+    virtual void onBye(const AmSipRequest& /* req */);
27 27
     virtual void onDtmf(int /* event */, int /* duration_msec */);
28 28
 
29
-    virtual void onOtherBye(const AmSipRequest& /* req */);
30
-    virtual void onOtherReply(const AmSipReply& /* r */);
29
+//    virtual void onOtherBye(const AmSipRequest& /* req */);
30
+//    virtual void onOtherReply(const AmSipReply& /* r */);
31 31
 
32 32
 private:
33 33
     PySemsDialog(const PySemsDialog&);
... ...
@@ -1,3 +1,3 @@
1
-target = py_sems
2
-sources = sippy_semscmodule.cpp sippy_semsPySemsDialog.cpp sippy_semsAmSipDialog.cpp sippy_semsAmSipReply.cpp sippy_semsAmSipRequest.cpp sippy_semsstring.cpp
3
-headers = sipAPIpy_sems.h sippy_semsPySemsDialog.h sippy_semsAmSipDialog.h sippy_semsAmSipReply.h sippy_semsAmSipRequest.h sippy_semsstring.h
1
+target = py_sems_lib
2
+sources = sippy_sems_libcmodule.cpp sippy_sems_libPySemsDialog.cpp sippy_sems_libAmSipDialog.cpp sippy_sems_libAmSipReply.cpp sippy_sems_libAmSipRequest.cpp sippy_sems_libstring.cpp
3
+headers = sipAPIpy_sems_lib.h sippy_sems_libPySemsDialog.h sippy_sems_libAmSipDialog.h sippy_sems_libAmSipReply.h sippy_sems_libAmSipRequest.h sippy_sems_libstring.h
... ...
@@ -1,4 +1,4 @@
1
-%Module py_sems 0
1
+%Module py_sems_lib 0
2 2
 
3 3
 %Include string.sip
4 4
 %Include AmSipRequest.sip
5 5
new file mode 100644
... ...
@@ -0,0 +1,143 @@
1
+/*
2
+ * Internal module API header file.
3
+ *
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5
+ */
6
+
7
+#ifndef _py_sems_libAPI_H
8
+#define	_py_sems_libAPI_H
9
+
10
+
11
+#include <sip.h>
12
+
13
+
14
+/*
15
+ * Convenient names to refer to the names of classes defined in this module.
16
+ * These are part of the public API.
17
+ */
18
+
19
+#define	sipName_PySemsDialog	sipNm_py_sems_lib_PySemsDialog
20
+#define	sipName_AmSipDialog	sipNm_py_sems_lib_AmSipDialog
21
+#define	sipName_AmSipReply	sipNm_py_sems_lib_AmSipReply
22
+#define	sipName_AmSipRequest	sipNm_py_sems_lib_AmSipRequest
23
+
24
+
25
+/* Convenient names to call the SIP API. */
26
+#define	sipConvertFromSliceObject(o,len,start,stop,step,slen)	PySlice_GetIndicesEx((PySliceObject *)(o),(len),(start),(stop),(step),(slen))
27
+#define	sipIsSubClassInstance(o,wt)	PyObject_TypeCheck((o),(PyTypeObject *)(wt))
28
+
29
+#define	sipMapStringToClass		sipAPI_py_sems_lib -> api_map_string_to_class
30
+#define	sipMapIntToClass		sipAPI_py_sems_lib -> api_map_int_to_class
31
+#define	sipMalloc			sipAPI_py_sems_lib -> api_malloc
32
+#define	sipFree				sipAPI_py_sems_lib -> api_free
33
+#define	sipBuildResult			sipAPI_py_sems_lib -> api_build_result
34
+#define	sipCallMethod			sipAPI_py_sems_lib -> api_call_method
35
+#define	sipParseResult			sipAPI_py_sems_lib -> api_parse_result
36
+#define	sipParseArgs			sipAPI_py_sems_lib -> api_parse_args
37
+#define	sipCommonCtor			sipAPI_py_sems_lib -> api_common_ctor
38
+#define	sipCommonDtor			sipAPI_py_sems_lib -> api_common_dtor
39
+#define	sipConvertFromSequenceIndex	sipAPI_py_sems_lib -> api_convert_from_sequence_index
40
+#define	sipConvertFromVoidPtr		sipAPI_py_sems_lib -> api_convert_from_void_ptr
41
+#define	sipConvertToCpp			sipAPI_py_sems_lib -> api_convert_to_cpp
42
+#define	sipConvertToVoidPtr		sipAPI_py_sems_lib -> api_convert_to_void_ptr
43
+#define	sipNoCtor			sipAPI_py_sems_lib -> api_no_ctor
44
+#define	sipNoFunction			sipAPI_py_sems_lib -> api_no_function
45
+#define	sipNoMethod			sipAPI_py_sems_lib -> api_no_method
46
+#define	sipBadClass			sipAPI_py_sems_lib -> api_bad_class
47
+#define	sipBadSetType			sipAPI_py_sems_lib -> api_bad_set_type
48
+#define	sipBadCatcherResult		sipAPI_py_sems_lib -> api_bad_catcher_result
49
+#define	sipTrace			sipAPI_py_sems_lib -> api_trace
50
+#define	sipTransfer			sipAPI_py_sems_lib -> api_transfer
51
+#define	sipGetWrapper			sipAPI_py_sems_lib -> api_get_wrapper
52
+#define	sipGetCppPtr			sipAPI_py_sems_lib -> api_get_cpp_ptr
53
+#define	sipGetComplexCppPtr		sipAPI_py_sems_lib -> api_get_complex_cpp_ptr
54
+#define	sipIsPyMethod			sipAPI_py_sems_lib -> api_is_py_method
55
+#define	sipMapCppToSelf			sipAPI_py_sems_lib -> api_map_cpp_to_self
56
+#define	sipMapCppToSelfSubClass		sipAPI_py_sems_lib -> api_map_cpp_to_self_sub_class
57
+#define	sipNewCppToSelf			sipAPI_py_sems_lib -> api_new_cpp_to_self
58
+#define	sipNewCppToSelfSubClass		sipAPI_py_sems_lib -> api_new_cpp_to_self_sub_class
59
+#define	sipCallHook			sipAPI_py_sems_lib -> api_call_hook
60
+#define	sipStartThread			sipAPI_py_sems_lib -> api_start_thread
61
+#define	sipEndThread			sipAPI_py_sems_lib -> api_end_thread
62
+#define	sipEmitSignal			sipAPI_py_sems_lib -> api_emit_signal
63
+#define	sipEmitToSlot			sipAPI_py_sems_lib -> api_emit_to_slot
64
+#define	sipConnectRx			sipAPI_py_sems_lib -> api_connect_rx
65
+#define	sipDisconnectRx			sipAPI_py_sems_lib -> api_disconnect_rx
66
+#define	sipGetSender			sipAPI_py_sems_lib -> api_get_sender
67
+#define	sipRaiseUnknownException	sipAPI_py_sems_lib -> api_raise_unknown_exception
68
+#define	sipRaiseClassException		sipAPI_py_sems_lib -> api_raise_class_exception
69
+#define	sipRaiseSubClassException	sipAPI_py_sems_lib -> api_raise_sub_class_exception
70
+#define	sipBadLengthForSlice		sipAPI_py_sems_lib -> api_bad_length_for_slice
71
+#define	sipClassName			sipAPI_py_sems_lib -> api_class_name
72
+#define	sipAddClassInstance		sipAPI_py_sems_lib -> api_add_class_instance
73
+
74
+
75
+/* The strings used by this module. */
76
+extern char sipNm_py_sems_lib_onDtmf[];
77
+extern char sipNm_py_sems_lib_onBye[];
78
+extern char sipNm_py_sems_lib_onCancel[];
79
+extern char sipNm_py_sems_lib_onSessionStart[];
80
+extern char sipNm_py_sems_lib_onInvite[];
81
+extern char sipNm_py_sems_lib_setStopped[];
82
+extern char sipNm_py_sems_lib_acceptAudio[];
83
+extern char sipNm_py_sems_lib_dlg[];
84
+extern char sipNm_py_sems_lib_PySemsDialog[];
85
+extern char sipNm_py_sems_lib_reinvite[];
86
+extern char sipNm_py_sems_lib_update[];
87
+extern char sipNm_py_sems_lib_cancel[];
88
+extern char sipNm_py_sems_lib_bye[];
89
+extern char sipNm_py_sems_lib_sendRequest[];
90
+extern char sipNm_py_sems_lib_reply[];
91
+extern char sipNm_py_sems_lib_updateStatus[];
92
+extern char sipNm_py_sems_lib_getContactHdr[];
93
+extern char sipNm_py_sems_lib_getStatus[];
94
+extern char sipNm_py_sems_lib_getUACTransPending[];
95
+extern char sipNm_py_sems_lib_setRoute[];
96
+extern char sipNm_py_sems_lib_getRoute[];
97
+extern char sipNm_py_sems_lib_local_party[];
98
+extern char sipNm_py_sems_lib_remote_party[];
99
+extern char sipNm_py_sems_lib_contact_uri[];
100
+extern char sipNm_py_sems_lib_remote_uri[];
101
+extern char sipNm_py_sems_lib_local_uri[];
102
+extern char sipNm_py_sems_lib_sip_port[];
103
+extern char sipNm_py_sems_lib_sip_ip[];
104
+extern char sipNm_py_sems_lib_Disconnecting[];
105
+extern char sipNm_py_sems_lib_Connected[];
106
+extern char sipNm_py_sems_lib_Pending[];
107
+extern char sipNm_py_sems_lib_Disconnected[];
108
+extern char sipNm_py_sems_lib_AmSipDialog[];
109
+extern char sipNm_py_sems_lib_local_tag[];
110
+extern char sipNm_py_sems_lib_remote_tag[];
111
+extern char sipNm_py_sems_lib_next_request_uri[];
112
+extern char sipNm_py_sems_lib_reason[];
113
+extern char sipNm_py_sems_lib_code[];
114
+extern char sipNm_py_sems_lib_AmSipReply[];
115
+extern char sipNm_py_sems_lib_getHeader[];
116
+extern char sipNm_py_sems_lib_key[];
117
+extern char sipNm_py_sems_lib_next_hop[];
118
+extern char sipNm_py_sems_lib_route[];
119
+extern char sipNm_py_sems_lib_body[];
120
+extern char sipNm_py_sems_lib_hdrs[];
121
+extern char sipNm_py_sems_lib_cseq[];
122
+extern char sipNm_py_sems_lib_to_tag[];
123
+extern char sipNm_py_sems_lib_from_tag[];
124
+extern char sipNm_py_sems_lib_callid[];
125
+extern char sipNm_py_sems_lib_to[];
126
+extern char sipNm_py_sems_lib_from[];
127
+extern char sipNm_py_sems_lib_from_uri[];
128
+extern char sipNm_py_sems_lib_r_uri[];
129
+extern char sipNm_py_sems_lib_port[];
130
+extern char sipNm_py_sems_lib_dstip[];
131
+extern char sipNm_py_sems_lib_domain[];
132
+extern char sipNm_py_sems_lib_user[];
133
+extern char sipNm_py_sems_lib_method[];
134
+extern char sipNm_py_sems_lib_cmd[];
135
+extern char sipNm_py_sems_lib_AmSipRequest[];
136
+extern char sipNm_py_sems_lib_string[];
137
+
138
+
139
+/* The SIP API, this module's API and the APIs of any imported modules. */
140
+extern const sipAPIDef *sipAPI_py_sems_lib;
141
+extern sipExportedModuleDef sipModuleAPI_py_sems_lib;
142
+
143
+#endif
0 144
deleted file mode 100644
... ...
@@ -1,25 +0,0 @@
1
-/*
2
- * Interface header file.
3
- *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
5
- */
6
-
7
-#ifndef _py_semsAmSipDialog_h
8
-#define	_py_semsAmSipDialog_h
9
-
10
-#line 6 "AmSipDialog.sip"
11
-#include "../../../core/AmSipDialog.h"
12
-#line 13 "sippy_semsAmSipDialog.h"
13
-
14
-#include "sippy_semsstring.h"
15
-#include "sippy_semsAmSipRequest.h"
16
-#include "sippy_semsAmSipReply.h"
17
-
18
-
19
-#define	sipClass_AmSipDialog	sipModuleAPI_py_sems.em_types[1]
20
-#define	sipCast_AmSipDialog	sipType_AmSipDialog.td_cast
21
-#define	sipForceConvertTo_AmSipDialog	sipType_AmSipDialog.td_fcto
22
-
23
-extern sipTypeDef sipType_AmSipDialog;
24
-
25
-#endif
26 0
similarity index 79%
27 1
rename from apps/py_sems/sip/sippy_semsAmSipDialog.cpp
28 2
rename to apps/py_sems/sip/sippy_sems_libAmSipDialog.cpp
... ...
@@ -1,11 +1,11 @@
1 1
 /*
2 2
  * Interface wrapper code.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#include "sipAPIpy_sems.h"
8
-#include "sippy_semsAmSipDialog.h"
7
+#include "sipAPIpy_sems_lib.h"
8
+#include "sippy_sems_libAmSipDialog.h"
9 9
 
10 10
 
11 11
 static PyObject *meth_AmSipDialog_getRoute(PyObject *sipSelf,PyObject *sipArgs)
... ...
@@ -29,7 +29,7 @@ static PyObject *meth_AmSipDialog_getRoute(PyObject *sipSelf,PyObject *sipArgs)
29 29
 	}
30 30
 
31 31
 	/* Raise an exception if the arguments couldn't be parsed. */
32
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_getRoute);
32
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_getRoute);
33 33
 
34 34
 	return NULL;
35 35
 }
... ...
@@ -57,7 +57,7 @@ static PyObject *meth_AmSipDialog_setRoute(PyObject *sipSelf,PyObject *sipArgs)
57 57
 	}
58 58
 
59 59
 	/* Raise an exception if the arguments couldn't be parsed. */
60
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_setRoute);
60
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_setRoute);
61 61
 
62 62
 	return NULL;
63 63
 }
... ...
@@ -81,7 +81,7 @@ static PyObject *meth_AmSipDialog_getUACTransPending(PyObject *sipSelf,PyObject
81 81
 	}
82 82
 
83 83
 	/* Raise an exception if the arguments couldn't be parsed. */
84
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_getUACTransPending);
84
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_getUACTransPending);
85 85
 
86 86
 	return NULL;
87 87
 }
... ...
@@ -105,7 +105,7 @@ static PyObject *meth_AmSipDialog_getStatus(PyObject *sipSelf,PyObject *sipArgs)
105 105
 	}
106 106
 
107 107
 	/* Raise an exception if the arguments couldn't be parsed. */
108
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_getStatus);
108
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_getStatus);
109 109
 
110 110
 	return NULL;
111 111
 }
... ...
@@ -132,7 +132,7 @@ static PyObject *meth_AmSipDialog_getContactHdr(PyObject *sipSelf,PyObject *sipA
132 132
 	}
133 133
 
134 134
 	/* Raise an exception if the arguments couldn't be parsed. */
135
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_getContactHdr);
135
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_getContactHdr);
136 136
 
137 137
 	return NULL;
138 138
 }
... ...
@@ -169,7 +169,7 @@ static PyObject *meth_AmSipDialog_updateStatus(PyObject *sipSelf,PyObject *sipAr
169 169
 	}
170 170
 
171 171
 	/* Raise an exception if the arguments couldn't be parsed. */
172
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_updateStatus);
172
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_updateStatus);
173 173
 
174 174
 	return NULL;
175 175
 }
... ...
@@ -215,7 +215,7 @@ static PyObject *meth_AmSipDialog_reply(PyObject *sipSelf,PyObject *sipArgs)
215 215
 	}
216 216
 
217 217
 	/* Raise an exception if the arguments couldn't be parsed. */
218
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_reply);
218
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_reply);
219 219
 
220 220
 	return NULL;
221 221
 }
... ...
@@ -259,7 +259,7 @@ static PyObject *meth_AmSipDialog_sendRequest(PyObject *sipSelf,PyObject *sipArg
259 259
 	}
260 260
 
261 261
 	/* Raise an exception if the arguments couldn't be parsed. */
262
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_sendRequest);
262
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_sendRequest);
263 263
 
264 264
 	return NULL;
265 265
 }
... ...
@@ -283,7 +283,7 @@ static PyObject *meth_AmSipDialog_bye(PyObject *sipSelf,PyObject *sipArgs)
283 283
 	}
284 284
 
285 285
 	/* Raise an exception if the arguments couldn't be parsed. */
286
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_bye);
286
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_bye);
287 287
 
288 288
 	return NULL;
289 289
 }
... ...
@@ -307,7 +307,7 @@ static PyObject *meth_AmSipDialog_cancel(PyObject *sipSelf,PyObject *sipArgs)
307 307
 	}
308 308
 
309 309
 	/* Raise an exception if the arguments couldn't be parsed. */
310
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_cancel);
310
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_cancel);
311 311
 
312 312
 	return NULL;
313 313
 }
... ...
@@ -336,7 +336,7 @@ static PyObject *meth_AmSipDialog_update(PyObject *sipSelf,PyObject *sipArgs)
336 336
 	}
337 337
 
338 338
 	/* Raise an exception if the arguments couldn't be parsed. */
339
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_update);
339
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_update);
340 340
 
341 341
 	return NULL;
342 342
 }
... ...
@@ -375,7 +375,7 @@ static PyObject *meth_AmSipDialog_reinvite(PyObject *sipSelf,PyObject *sipArgs)
375 375
 	}
376 376
 
377 377
 	/* Raise an exception if the arguments couldn't be parsed. */
378
-	sipNoMethod(sipArgsParsed,sipNm_py_sems_AmSipDialog,sipNm_py_sems_reinvite);
378
+	sipNoMethod(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_reinvite);
379 379
 
380 380
 	return NULL;
381 381
 }
... ...
@@ -425,7 +425,7 @@ static void *init_AmSipDialog(sipWrapper *,PyObject *sipArgs,int *)
425 425
 
426 426
 	if (!sipCpp)
427 427
 	{
428
-		sipNoCtor(sipArgsParsed,sipNm_py_sems_AmSipDialog);
428
+		sipNoCtor(sipArgsParsed,sipNm_py_sems_lib_AmSipDialog);
429 429
 		return 0;
430 430
 	}
431 431
 
... ...
@@ -454,7 +454,7 @@ static PyObject *var_AmSipDialog_cseq(PyObject *sipSelf,PyObject *valobj)
454 454
 
455 455
 	if (PyErr_Occurred() != NULL)
456 456
 	{
457
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_cseq);
457
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_cseq);
458 458
 		return NULL;
459 459
 	}
460 460
 
... ...
@@ -487,7 +487,7 @@ static PyObject *var_AmSipDialog_next_hop(PyObject *sipSelf,PyObject *valobj)
487 487
 
488 488
 	if (iserr)
489 489
 	{
490
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_next_hop);
490
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_next_hop);
491 491
 		return NULL;
492 492
 	}
493 493
 
... ...
@@ -520,7 +520,7 @@ static PyObject *var_AmSipDialog_local_party(PyObject *sipSelf,PyObject *valobj)
520 520
 
521 521
 	if (iserr)
522 522
 	{
523
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_local_party);
523
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_local_party);
524 524
 		return NULL;
525 525
 	}
526 526
 
... ...
@@ -553,7 +553,7 @@ static PyObject *var_AmSipDialog_remote_party(PyObject *sipSelf,PyObject *valobj
553 553
 
554 554
 	if (iserr)
555 555
 	{
556
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_remote_party);
556
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_remote_party);
557 557
 		return NULL;
558 558
 	}
559 559
 
... ...
@@ -586,7 +586,7 @@ static PyObject *var_AmSipDialog_local_tag(PyObject *sipSelf,PyObject *valobj)
586 586
 
587 587
 	if (iserr)
588 588
 	{
589
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_local_tag);
589
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_local_tag);
590 590
 		return NULL;
591 591
 	}
592 592
 
... ...
@@ -619,7 +619,7 @@ static PyObject *var_AmSipDialog_remote_tag(PyObject *sipSelf,PyObject *valobj)
619 619
 
620 620
 	if (iserr)
621 621
 	{
622
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_remote_tag);
622
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_remote_tag);
623 623
 		return NULL;
624 624
 	}
625 625
 
... ...
@@ -652,7 +652,7 @@ static PyObject *var_AmSipDialog_callid(PyObject *sipSelf,PyObject *valobj)
652 652
 
653 653
 	if (iserr)
654 654
 	{
655
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_callid);
655
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_callid);
656 656
 		return NULL;
657 657
 	}
658 658
 
... ...
@@ -685,7 +685,7 @@ static PyObject *var_AmSipDialog_contact_uri(PyObject *sipSelf,PyObject *valobj)
685 685
 
686 686
 	if (iserr)
687 687
 	{
688
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_contact_uri);
688
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_contact_uri);
689 689
 		return NULL;
690 690
 	}
691 691
 
... ...
@@ -718,7 +718,7 @@ static PyObject *var_AmSipDialog_remote_uri(PyObject *sipSelf,PyObject *valobj)
718 718
 
719 719
 	if (iserr)
720 720
 	{
721
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_remote_uri);
721
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_remote_uri);
722 722
 		return NULL;
723 723
 	}
724 724
 
... ...
@@ -751,7 +751,7 @@ static PyObject *var_AmSipDialog_local_uri(PyObject *sipSelf,PyObject *valobj)
751 751
 
752 752
 	if (iserr)
753 753
 	{
754
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_local_uri);
754
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_local_uri);
755 755
 		return NULL;
756 756
 	}
757 757
 
... ...
@@ -784,7 +784,7 @@ static PyObject *var_AmSipDialog_sip_port(PyObject *sipSelf,PyObject *valobj)
784 784
 
785 785
 	if (iserr)
786 786
 	{
787
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_sip_port);
787
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_sip_port);
788 788
 		return NULL;
789 789
 	}
790 790
 
... ...
@@ -817,7 +817,7 @@ static PyObject *var_AmSipDialog_sip_ip(PyObject *sipSelf,PyObject *valobj)
817 817
 
818 818
 	if (iserr)
819 819
 	{
820
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_sip_ip);
820
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_sip_ip);
821 821
 		return NULL;
822 822
 	}
823 823
 
... ...
@@ -850,7 +850,7 @@ static PyObject *var_AmSipDialog_domain(PyObject *sipSelf,PyObject *valobj)
850 850
 
851 851
 	if (iserr)
852 852
 	{
853
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_domain);
853
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_domain);
854 854
 		return NULL;
855 855
 	}
856 856
 
... ...
@@ -883,7 +883,7 @@ static PyObject *var_AmSipDialog_user(PyObject *sipSelf,PyObject *valobj)
883 883
 
884 884
 	if (iserr)
885 885
 	{
886
-		sipBadSetType(sipNm_py_sems_AmSipDialog,sipNm_py_sems_user);
886
+		sipBadSetType(sipNm_py_sems_lib_AmSipDialog,sipNm_py_sems_lib_user);
887 887
 		return NULL;
888 888
 	}
889 889
 
... ...
@@ -894,20 +894,20 @@ static PyObject *var_AmSipDialog_user(PyObject *sipSelf,PyObject *valobj)
894 894
 }
895 895
 
896 896
 PyMethodDef variables_AmSipDialog[] = {
897
-	{sipNm_py_sems_cseq, var_AmSipDialog_cseq, 0, NULL},
898
-	{sipNm_py_sems_next_hop, var_AmSipDialog_next_hop, 0, NULL},
899
-	{sipNm_py_sems_local_party, var_AmSipDialog_local_party, 0, NULL},
900
-	{sipNm_py_sems_remote_party, var_AmSipDialog_remote_party, 0, NULL},
901
-	{sipNm_py_sems_local_tag, var_AmSipDialog_local_tag, 0, NULL},
902
-	{sipNm_py_sems_remote_tag, var_AmSipDialog_remote_tag, 0, NULL},
903
-	{sipNm_py_sems_callid, var_AmSipDialog_callid, 0, NULL},
904
-	{sipNm_py_sems_contact_uri, var_AmSipDialog_contact_uri, 0, NULL},
905
-	{sipNm_py_sems_remote_uri, var_AmSipDialog_remote_uri, 0, NULL},
906
-	{sipNm_py_sems_local_uri, var_AmSipDialog_local_uri, 0, NULL},
907
-	{sipNm_py_sems_sip_port, var_AmSipDialog_sip_port, 0, NULL},
908
-	{sipNm_py_sems_sip_ip, var_AmSipDialog_sip_ip, 0, NULL},
909
-	{sipNm_py_sems_domain, var_AmSipDialog_domain, 0, NULL},
910
-	{sipNm_py_sems_user, var_AmSipDialog_user, 0, NULL},
897
+	{sipNm_py_sems_lib_cseq, var_AmSipDialog_cseq, 0, NULL},
898
+	{sipNm_py_sems_lib_next_hop, var_AmSipDialog_next_hop, 0, NULL},
899
+	{sipNm_py_sems_lib_local_party, var_AmSipDialog_local_party, 0, NULL},
900
+	{sipNm_py_sems_lib_remote_party, var_AmSipDialog_remote_party, 0, NULL},
901
+	{sipNm_py_sems_lib_local_tag, var_AmSipDialog_local_tag, 0, NULL},
902
+	{sipNm_py_sems_lib_remote_tag, var_AmSipDialog_remote_tag, 0, NULL},
903
+	{sipNm_py_sems_lib_callid, var_AmSipDialog_callid, 0, NULL},
904
+	{sipNm_py_sems_lib_contact_uri, var_AmSipDialog_contact_uri, 0, NULL},
905
+	{sipNm_py_sems_lib_remote_uri, var_AmSipDialog_remote_uri, 0, NULL},
906
+	{sipNm_py_sems_lib_local_uri, var_AmSipDialog_local_uri, 0, NULL},
907
+	{sipNm_py_sems_lib_sip_port, var_AmSipDialog_sip_port, 0, NULL},
908
+	{sipNm_py_sems_lib_sip_ip, var_AmSipDialog_sip_ip, 0, NULL},
909
+	{sipNm_py_sems_lib_domain, var_AmSipDialog_domain, 0, NULL},
910
+	{sipNm_py_sems_lib_user, var_AmSipDialog_user, 0, NULL},
911 911
 	{0, 0, 0, 0}
912 912
 };
913 913
 
... ...
@@ -920,7 +920,7 @@ static void *forceConvertTo_AmSipDialog(PyObject *valobj,int *iserrp)
920 920
 	if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_AmSipDialog))
921 921
 		return sipConvertToCpp(valobj,sipClass_AmSipDialog,iserrp);
922 922
 
923
-	sipBadClass(sipNm_py_sems_AmSipDialog);
923
+	sipBadClass(sipNm_py_sems_lib_AmSipDialog);
924 924
 
925 925
 	*iserrp = 1;
926 926
 
... ...
@@ -929,32 +929,32 @@ static void *forceConvertTo_AmSipDialog(PyObject *valobj,int *iserrp)
929 929
 
930 930
 
931 931
 static PyMethodDef methods_AmSipDialog[] = {
932
-	{sipNm_py_sems_bye, meth_AmSipDialog_bye, METH_VARARGS, NULL},
933
-	{sipNm_py_sems_cancel, meth_AmSipDialog_cancel, METH_VARARGS, NULL},
934
-	{sipNm_py_sems_getContactHdr, meth_AmSipDialog_getContactHdr, METH_VARARGS, NULL},
935
-	{sipNm_py_sems_getRoute, meth_AmSipDialog_getRoute, METH_VARARGS, NULL},
936
-	{sipNm_py_sems_getStatus, meth_AmSipDialog_getStatus, METH_VARARGS, NULL},
937
-	{sipNm_py_sems_getUACTransPending, meth_AmSipDialog_getUACTransPending, METH_VARARGS, NULL},
938
-	{sipNm_py_sems_reinvite, meth_AmSipDialog_reinvite, METH_VARARGS, NULL},
939
-	{sipNm_py_sems_reply, meth_AmSipDialog_reply, METH_VARARGS, NULL},
940
-	{sipNm_py_sems_sendRequest, meth_AmSipDialog_sendRequest, METH_VARARGS, NULL},
941
-	{sipNm_py_sems_setRoute, meth_AmSipDialog_setRoute, METH_VARARGS, NULL},
942
-	{sipNm_py_sems_update, meth_AmSipDialog_update, METH_VARARGS, NULL},
943
-	{sipNm_py_sems_updateStatus, meth_AmSipDialog_updateStatus, METH_VARARGS, NULL}
932
+	{sipNm_py_sems_lib_bye, meth_AmSipDialog_bye, METH_VARARGS, NULL},
933
+	{sipNm_py_sems_lib_cancel, meth_AmSipDialog_cancel, METH_VARARGS, NULL},
934
+	{sipNm_py_sems_lib_getContactHdr, meth_AmSipDialog_getContactHdr, METH_VARARGS, NULL},
935
+	{sipNm_py_sems_lib_getRoute, meth_AmSipDialog_getRoute, METH_VARARGS, NULL},
936
+	{sipNm_py_sems_lib_getStatus, meth_AmSipDialog_getStatus, METH_VARARGS, NULL},
937
+	{sipNm_py_sems_lib_getUACTransPending, meth_AmSipDialog_getUACTransPending, METH_VARARGS, NULL},
938
+	{sipNm_py_sems_lib_reinvite, meth_AmSipDialog_reinvite, METH_VARARGS, NULL},
939
+	{sipNm_py_sems_lib_reply, meth_AmSipDialog_reply, METH_VARARGS, NULL},
940
+	{sipNm_py_sems_lib_sendRequest, meth_AmSipDialog_sendRequest, METH_VARARGS, NULL},
941
+	{sipNm_py_sems_lib_setRoute, meth_AmSipDialog_setRoute, METH_VARARGS, NULL},
942
+	{sipNm_py_sems_lib_update, meth_AmSipDialog_update, METH_VARARGS, NULL},
943
+	{sipNm_py_sems_lib_updateStatus, meth_AmSipDialog_updateStatus, METH_VARARGS, NULL}
944 944
 };
945 945
 
946 946
 static sipEnumValueInstanceDef enums_AmSipDialog[] = {
947
-	{sipNm_py_sems_Connected, AmSipDialog::Connected},
948
-	{sipNm_py_sems_Disconnected, AmSipDialog::Disconnected},
949
-	{sipNm_py_sems_Disconnecting, AmSipDialog::Disconnecting},
950
-	{sipNm_py_sems_Pending, AmSipDialog::Pending}
947
+	{sipNm_py_sems_lib_Connected, AmSipDialog::Connected},
948
+	{sipNm_py_sems_lib_Disconnected, AmSipDialog::Disconnected},
949
+	{sipNm_py_sems_lib_Disconnecting, AmSipDialog::Disconnecting},
950
+	{sipNm_py_sems_lib_Pending, AmSipDialog::Pending}
951 951
 };
952 952
 
953 953
 
954 954
 /* The main type data structure. */
955 955
 sipTypeDef sipType_AmSipDialog = {
956 956
 	0,
957
-	"py_sems.AmSipDialog",
957
+	"py_sems_lib.AmSipDialog",
958 958
 	-1,
959 959
 	0,
960 960
 	0,
961 961
new file mode 100644
... ...
@@ -0,0 +1,25 @@
1
+/*
2
+ * Interface header file.
3
+ *
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5
+ */
6
+
7
+#ifndef _py_sems_libAmSipDialog_h
8
+#define	_py_sems_libAmSipDialog_h
9
+
10
+#line 6 "AmSipDialog.sip"
11
+#include "../../../core/AmSipDialog.h"
12
+#line 13 "sippy_sems_libAmSipDialog.h"
13
+
14
+#include "sippy_sems_libstring.h"
15
+#include "sippy_sems_libAmSipRequest.h"
16
+#include "sippy_sems_libAmSipReply.h"
17
+
18
+
19
+#define	sipClass_AmSipDialog	sipModuleAPI_py_sems_lib.em_types[1]
20
+#define	sipCast_AmSipDialog	sipType_AmSipDialog.td_cast
21
+#define	sipForceConvertTo_AmSipDialog	sipType_AmSipDialog.td_fcto
22
+
23
+extern sipTypeDef sipType_AmSipDialog;
24
+
25
+#endif
0 26
similarity index 80%
1 27
rename from apps/py_sems/sip/sippy_semsAmSipReply.cpp
2 28
rename to apps/py_sems/sip/sippy_sems_libAmSipReply.cpp
... ...
@@ -1,11 +1,11 @@
1 1
 /*
2 2
  * Interface wrapper code.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#include "sipAPIpy_sems.h"
8
-#include "sippy_semsAmSipReply.h"
7
+#include "sipAPIpy_sems_lib.h"
8
+#include "sippy_sems_libAmSipReply.h"
9 9
 
10 10
 
11 11
 /* Cast a pointer to a type somewhere in its superclass hierarchy. */
... ...
@@ -52,7 +52,7 @@ static void *init_AmSipReply(sipWrapper *,PyObject *sipArgs,int *)
52 52
 
53 53
 	if (!sipCpp)
54 54
 	{
55
-		sipNoCtor(sipArgsParsed,sipNm_py_sems_AmSipReply);
55
+		sipNoCtor(sipArgsParsed,sipNm_py_sems_lib_AmSipReply);
56 56
 		return 0;
57 57
 	}
58 58
 
... ...
@@ -81,7 +81,7 @@ static PyObject *var_AmSipReply_cseq(PyObject *sipSelf,PyObject *valobj)
81 81
 
82 82
 	if (PyErr_Occurred() != NULL)
83 83
 	{
84
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_cseq);
84
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_cseq);
85 85
 		return NULL;
86 86
 	}
87 87
 
... ...
@@ -114,7 +114,7 @@ static PyObject *var_AmSipReply_local_tag(PyObject *sipSelf,PyObject *valobj)
114 114
 
115 115
 	if (iserr)
116 116
 	{
117
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_local_tag);
117
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_local_tag);
118 118
 		return NULL;
119 119
 	}
120 120
 
... ...
@@ -147,7 +147,7 @@ static PyObject *var_AmSipReply_remote_tag(PyObject *sipSelf,PyObject *valobj)
147 147
 
148 148
 	if (iserr)
149 149
 	{
150
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_remote_tag);
150
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_remote_tag);
151 151
 		return NULL;
152 152
 	}
153 153
 
... ...
@@ -180,7 +180,7 @@ static PyObject *var_AmSipReply_body(PyObject *sipSelf,PyObject *valobj)
180 180
 
181 181
 	if (iserr)
182 182
 	{
183
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_body);
183
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_body);
184 184
 		return NULL;
185 185
 	}
186 186
 
... ...
@@ -213,7 +213,7 @@ static PyObject *var_AmSipReply_hdrs(PyObject *sipSelf,PyObject *valobj)
213 213
 
214 214
 	if (iserr)
215 215
 	{
216
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_hdrs);
216
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_hdrs);
217 217
 		return NULL;
218 218
 	}
219 219
 
... ...
@@ -246,7 +246,7 @@ static PyObject *var_AmSipReply_route(PyObject *sipSelf,PyObject *valobj)
246 246
 
247 247
 	if (iserr)
248 248
 	{
249
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_route);
249
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_route);
250 250
 		return NULL;
251 251
 	}
252 252
 
... ...
@@ -279,7 +279,7 @@ static PyObject *var_AmSipReply_next_hop(PyObject *sipSelf,PyObject *valobj)
279 279
 
280 280
 	if (iserr)
281 281
 	{
282
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_next_hop);
282
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_next_hop);
283 283
 		return NULL;
284 284
 	}
285 285
 
... ...
@@ -312,7 +312,7 @@ static PyObject *var_AmSipReply_next_request_uri(PyObject *sipSelf,PyObject *val
312 312
 
313 313
 	if (iserr)
314 314
 	{
315
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_next_request_uri);
315
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_next_request_uri);
316 316
 		return NULL;
317 317
 	}
318 318
 
... ...
@@ -345,7 +345,7 @@ static PyObject *var_AmSipReply_reason(PyObject *sipSelf,PyObject *valobj)
345 345
 
346 346
 	if (iserr)
347 347
 	{
348
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_reason);
348
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_reason);
349 349
 		return NULL;
350 350
 	}
351 351
 
... ...
@@ -377,7 +377,7 @@ static PyObject *var_AmSipReply_code(PyObject *sipSelf,PyObject *valobj)
377 377
 
378 378
 	if (PyErr_Occurred() != NULL)
379 379
 	{
380
-		sipBadSetType(sipNm_py_sems_AmSipReply,sipNm_py_sems_code);
380
+		sipBadSetType(sipNm_py_sems_lib_AmSipReply,sipNm_py_sems_lib_code);
381 381
 		return NULL;
382 382
 	}
383 383
 
... ...
@@ -388,16 +388,16 @@ static PyObject *var_AmSipReply_code(PyObject *sipSelf,PyObject *valobj)
388 388
 }
389 389
 
390 390
 PyMethodDef variables_AmSipReply[] = {
391
-	{sipNm_py_sems_cseq, var_AmSipReply_cseq, 0, NULL},
392
-	{sipNm_py_sems_local_tag, var_AmSipReply_local_tag, 0, NULL},
393
-	{sipNm_py_sems_remote_tag, var_AmSipReply_remote_tag, 0, NULL},
394
-	{sipNm_py_sems_body, var_AmSipReply_body, 0, NULL},
395
-	{sipNm_py_sems_hdrs, var_AmSipReply_hdrs, 0, NULL},
396
-	{sipNm_py_sems_route, var_AmSipReply_route, 0, NULL},
397
-	{sipNm_py_sems_next_hop, var_AmSipReply_next_hop, 0, NULL},
398
-	{sipNm_py_sems_next_request_uri, var_AmSipReply_next_request_uri, 0, NULL},
399
-	{sipNm_py_sems_reason, var_AmSipReply_reason, 0, NULL},
400
-	{sipNm_py_sems_code, var_AmSipReply_code, 0, NULL},
391
+	{sipNm_py_sems_lib_cseq, var_AmSipReply_cseq, 0, NULL},
392
+	{sipNm_py_sems_lib_local_tag, var_AmSipReply_local_tag, 0, NULL},
393
+	{sipNm_py_sems_lib_remote_tag, var_AmSipReply_remote_tag, 0, NULL},
394
+	{sipNm_py_sems_lib_body, var_AmSipReply_body, 0, NULL},
395
+	{sipNm_py_sems_lib_hdrs, var_AmSipReply_hdrs, 0, NULL},
396
+	{sipNm_py_sems_lib_route, var_AmSipReply_route, 0, NULL},
397
+	{sipNm_py_sems_lib_next_hop, var_AmSipReply_next_hop, 0, NULL},
398
+	{sipNm_py_sems_lib_next_request_uri, var_AmSipReply_next_request_uri, 0, NULL},
399
+	{sipNm_py_sems_lib_reason, var_AmSipReply_reason, 0, NULL},
400
+	{sipNm_py_sems_lib_code, var_AmSipReply_code, 0, NULL},
401 401
 	{0, 0, 0, 0}
402 402
 };
403 403
 
... ...
@@ -410,7 +410,7 @@ static void *forceConvertTo_AmSipReply(PyObject *valobj,int *iserrp)
410 410
 	if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_AmSipReply))
411 411
 		return sipConvertToCpp(valobj,sipClass_AmSipReply,iserrp);
412 412
 
413
-	sipBadClass(sipNm_py_sems_AmSipReply);
413
+	sipBadClass(sipNm_py_sems_lib_AmSipReply);
414 414
 
415 415
 	*iserrp = 1;
416 416
 
... ...
@@ -421,7 +421,7 @@ static void *forceConvertTo_AmSipReply(PyObject *valobj,int *iserrp)
421 421
 /* The main type data structure. */
422 422
 sipTypeDef sipType_AmSipReply = {
423 423
 	0,
424
-	"py_sems.AmSipReply",
424
+	"py_sems_lib.AmSipReply",
425 425
 	-1,
426 426
 	0,
427 427
 	0,
428 428
similarity index 50%
429 429
rename from apps/py_sems/sip/sippy_semsAmSipReply.h
430 430
rename to apps/py_sems/sip/sippy_sems_libAmSipReply.h
... ...
@@ -1,20 +1,20 @@
1 1
 /*
2 2
  * Interface header file.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#ifndef _py_semsAmSipReply_h
8
-#define	_py_semsAmSipReply_h
7
+#ifndef _py_sems_libAmSipReply_h
8
+#define	_py_sems_libAmSipReply_h
9 9
 
10 10
 #line 6 "AmSipReply.sip"
11 11
 #include "../../../core/AmSipReply.h"
12
-#line 13 "sippy_semsAmSipReply.h"
12
+#line 13 "sippy_sems_libAmSipReply.h"
13 13
 
14
-#include "sippy_semsstring.h"
14
+#include "sippy_sems_libstring.h"
15 15
 
16 16
 
17
-#define	sipClass_AmSipReply	sipModuleAPI_py_sems.em_types[2]
17
+#define	sipClass_AmSipReply	sipModuleAPI_py_sems_lib.em_types[2]
18 18
 #define	sipCast_AmSipReply	sipType_AmSipReply.td_cast
19 19
 #define	sipForceConvertTo_AmSipReply	sipType_AmSipReply.td_fcto
20 20
 
21 21
similarity index 80%
22 22
rename from apps/py_sems/sip/sippy_semsAmSipRequest.cpp
23 23
rename to apps/py_sems/sip/sippy_sems_libAmSipRequest.cpp
... ...
@@ -1,11 +1,11 @@
1 1
 /*
2 2
  * Interface wrapper code.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#include "sipAPIpy_sems.h"
8
-#include "sippy_semsAmSipRequest.h"
7
+#include "sipAPIpy_sems_lib.h"
8
+#include "sippy_sems_libAmSipRequest.h"
9 9
 
10 10
 
11 11
 /* Cast a pointer to a type somewhere in its superclass hierarchy. */
... ...
@@ -52,7 +52,7 @@ static void *init_AmSipRequest(sipWrapper *,PyObject *sipArgs,int *)
52 52
 
53 53
 	if (!sipCpp)
54 54
 	{
55
-		sipNoCtor(sipArgsParsed,sipNm_py_sems_AmSipRequest);
55
+		sipNoCtor(sipArgsParsed,sipNm_py_sems_lib_AmSipRequest);
56 56
 		return 0;
57 57
 	}
58 58
 
... ...
@@ -82,7 +82,7 @@ static PyObject *var_AmSipRequest_key(PyObject *sipSelf,PyObject *valobj)
82 82
 
83 83
 	if (iserr)
84 84
 	{
85
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_key);
85
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_key);
86 86
 		return NULL;
87 87
 	}
88 88
 
... ...
@@ -115,7 +115,7 @@ static PyObject *var_AmSipRequest_next_hop(PyObject *sipSelf,PyObject *valobj)
115 115
 
116 116
 	if (iserr)
117 117
 	{
118
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_next_hop);
118
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_next_hop);
119 119
 		return NULL;
120 120
 	}
121 121
 
... ...
@@ -148,7 +148,7 @@ static PyObject *var_AmSipRequest_route(PyObject *sipSelf,PyObject *valobj)
148 148
 
149 149
 	if (iserr)
150 150
 	{
151
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_route);
151
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_route);
152 152
 		return NULL;
153 153
 	}
154 154
 
... ...
@@ -181,7 +181,7 @@ static PyObject *var_AmSipRequest_body(PyObject *sipSelf,PyObject *valobj)
181 181
 
182 182
 	if (iserr)
183 183
 	{
184
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_body);
184
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_body);
185 185
 		return NULL;
186 186
 	}
187 187
 
... ...
@@ -214,7 +214,7 @@ static PyObject *var_AmSipRequest_hdrs(PyObject *sipSelf,PyObject *valobj)
214 214
 
215 215
 	if (iserr)
216 216
 	{
217
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_hdrs);
217
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_hdrs);
218 218
 		return NULL;
219 219
 	}
220 220
 
... ...
@@ -246,7 +246,7 @@ static PyObject *var_AmSipRequest_cseq(PyObject *sipSelf,PyObject *valobj)
246 246
 
247 247
 	if (PyErr_Occurred() != NULL)
248 248
 	{
249
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_cseq);
249
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_cseq);
250 250
 		return NULL;
251 251
 	}
252 252
 
... ...
@@ -279,7 +279,7 @@ static PyObject *var_AmSipRequest_to_tag(PyObject *sipSelf,PyObject *valobj)
279 279
 
280 280
 	if (iserr)
281 281
 	{
282
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_to_tag);
282
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_to_tag);
283 283
 		return NULL;
284 284
 	}
285 285
 
... ...
@@ -312,7 +312,7 @@ static PyObject *var_AmSipRequest_from_tag(PyObject *sipSelf,PyObject *valobj)
312 312
 
313 313
 	if (iserr)
314 314
 	{
315
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_from_tag);
315
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_from_tag);
316 316
 		return NULL;
317 317
 	}
318 318
 
... ...
@@ -345,7 +345,7 @@ static PyObject *var_AmSipRequest_callid(PyObject *sipSelf,PyObject *valobj)
345 345
 
346 346
 	if (iserr)
347 347
 	{
348
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_callid);
348
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_callid);
349 349
 		return NULL;
350 350
 	}
351 351
 
... ...
@@ -378,7 +378,7 @@ static PyObject *var_AmSipRequest_to(PyObject *sipSelf,PyObject *valobj)
378 378
 
379 379
 	if (iserr)
380 380
 	{
381
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_to);
381
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_to);
382 382
 		return NULL;
383 383
 	}
384 384
 
... ...
@@ -411,7 +411,7 @@ static PyObject *var_AmSipRequest_from(PyObject *sipSelf,PyObject *valobj)
411 411
 
412 412
 	if (iserr)
413 413
 	{
414
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_from);
414
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_from);
415 415
 		return NULL;
416 416
 	}
417 417
 
... ...
@@ -444,7 +444,7 @@ static PyObject *var_AmSipRequest_from_uri(PyObject *sipSelf,PyObject *valobj)
444 444
 
445 445
 	if (iserr)
446 446
 	{
447
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_from_uri);
447
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_from_uri);
448 448
 		return NULL;
449 449
 	}
450 450
 
... ...
@@ -477,7 +477,7 @@ static PyObject *var_AmSipRequest_r_uri(PyObject *sipSelf,PyObject *valobj)
477 477
 
478 478
 	if (iserr)
479 479
 	{
480
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_r_uri);
480
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_r_uri);
481 481
 		return NULL;
482 482
 	}
483 483
 
... ...
@@ -510,7 +510,7 @@ static PyObject *var_AmSipRequest_port(PyObject *sipSelf,PyObject *valobj)
510 510
 
511 511
 	if (iserr)
512 512
 	{
513
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_port);
513
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_port);
514 514
 		return NULL;
515 515
 	}
516 516
 
... ...
@@ -543,7 +543,7 @@ static PyObject *var_AmSipRequest_dstip(PyObject *sipSelf,PyObject *valobj)
543 543
 
544 544
 	if (iserr)
545 545
 	{
546
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_dstip);
546
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_dstip);
547 547
 		return NULL;
548 548
 	}
549 549
 
... ...
@@ -576,7 +576,7 @@ static PyObject *var_AmSipRequest_domain(PyObject *sipSelf,PyObject *valobj)
576 576
 
577 577
 	if (iserr)
578 578
 	{
579
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_domain);
579
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_domain);
580 580
 		return NULL;
581 581
 	}
582 582
 
... ...
@@ -609,7 +609,7 @@ static PyObject *var_AmSipRequest_user(PyObject *sipSelf,PyObject *valobj)
609 609
 
610 610
 	if (iserr)
611 611
 	{
612
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_user);
612
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_user);
613 613
 		return NULL;
614 614
 	}
615 615
 
... ...
@@ -642,7 +642,7 @@ static PyObject *var_AmSipRequest_method(PyObject *sipSelf,PyObject *valobj)
642 642
 
643 643
 	if (iserr)
644 644
 	{
645
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_method);
645
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_method);
646 646
 		return NULL;
647 647
 	}
648 648
 
... ...
@@ -675,7 +675,7 @@ static PyObject *var_AmSipRequest_cmd(PyObject *sipSelf,PyObject *valobj)
675 675
 
676 676
 	if (iserr)
677 677
 	{
678
-		sipBadSetType(sipNm_py_sems_AmSipRequest,sipNm_py_sems_cmd);
678
+		sipBadSetType(sipNm_py_sems_lib_AmSipRequest,sipNm_py_sems_lib_cmd);
679 679
 		return NULL;
680 680
 	}
681 681
 
... ...
@@ -686,25 +686,25 @@ static PyObject *var_AmSipRequest_cmd(PyObject *sipSelf,PyObject *valobj)
686 686
 }
687 687
 
688 688
 PyMethodDef variables_AmSipRequest[] = {
689
-	{sipNm_py_sems_key, var_AmSipRequest_key, 0, NULL},
690
-	{sipNm_py_sems_next_hop, var_AmSipRequest_next_hop, 0, NULL},
691
-	{sipNm_py_sems_route, var_AmSipRequest_route, 0, NULL},
692
-	{sipNm_py_sems_body, var_AmSipRequest_body, 0, NULL},
693
-	{sipNm_py_sems_hdrs, var_AmSipRequest_hdrs, 0, NULL},
694
-	{sipNm_py_sems_cseq, var_AmSipRequest_cseq, 0, NULL},
695
-	{sipNm_py_sems_to_tag, var_AmSipRequest_to_tag, 0, NULL},
696
-	{sipNm_py_sems_from_tag, var_AmSipRequest_from_tag, 0, NULL},
697
-	{sipNm_py_sems_callid, var_AmSipRequest_callid, 0, NULL},
698
-	{sipNm_py_sems_to, var_AmSipRequest_to, 0, NULL},
699
-	{sipNm_py_sems_from, var_AmSipRequest_from, 0, NULL},
700
-	{sipNm_py_sems_from_uri, var_AmSipRequest_from_uri, 0, NULL},
701
-	{sipNm_py_sems_r_uri, var_AmSipRequest_r_uri, 0, NULL},
702
-	{sipNm_py_sems_port, var_AmSipRequest_port, 0, NULL},
703
-	{sipNm_py_sems_dstip, var_AmSipRequest_dstip, 0, NULL},
704
-	{sipNm_py_sems_domain, var_AmSipRequest_domain, 0, NULL},
705
-	{sipNm_py_sems_user, var_AmSipRequest_user, 0, NULL},
706
-	{sipNm_py_sems_method, var_AmSipRequest_method, 0, NULL},
707
-	{sipNm_py_sems_cmd, var_AmSipRequest_cmd, 0, NULL},
689
+	{sipNm_py_sems_lib_key, var_AmSipRequest_key, 0, NULL},
690
+	{sipNm_py_sems_lib_next_hop, var_AmSipRequest_next_hop, 0, NULL},
691
+	{sipNm_py_sems_lib_route, var_AmSipRequest_route, 0, NULL},
692
+	{sipNm_py_sems_lib_body, var_AmSipRequest_body, 0, NULL},
693
+	{sipNm_py_sems_lib_hdrs, var_AmSipRequest_hdrs, 0, NULL},
694
+	{sipNm_py_sems_lib_cseq, var_AmSipRequest_cseq, 0, NULL},
695
+	{sipNm_py_sems_lib_to_tag, var_AmSipRequest_to_tag, 0, NULL},
696
+	{sipNm_py_sems_lib_from_tag, var_AmSipRequest_from_tag, 0, NULL},
697
+	{sipNm_py_sems_lib_callid, var_AmSipRequest_callid, 0, NULL},
698
+	{sipNm_py_sems_lib_to, var_AmSipRequest_to, 0, NULL},
699
+	{sipNm_py_sems_lib_from, var_AmSipRequest_from, 0, NULL},
700
+	{sipNm_py_sems_lib_from_uri, var_AmSipRequest_from_uri, 0, NULL},
701
+	{sipNm_py_sems_lib_r_uri, var_AmSipRequest_r_uri, 0, NULL},
702
+	{sipNm_py_sems_lib_port, var_AmSipRequest_port, 0, NULL},
703
+	{sipNm_py_sems_lib_dstip, var_AmSipRequest_dstip, 0, NULL},
704
+	{sipNm_py_sems_lib_domain, var_AmSipRequest_domain, 0, NULL},
705
+	{sipNm_py_sems_lib_user, var_AmSipRequest_user, 0, NULL},
706
+	{sipNm_py_sems_lib_method, var_AmSipRequest_method, 0, NULL},
707
+	{sipNm_py_sems_lib_cmd, var_AmSipRequest_cmd, 0, NULL},
708 708
 	{0, 0, 0, 0}
709 709
 };
710 710
 
... ...
@@ -717,7 +717,7 @@ static void *forceConvertTo_AmSipRequest(PyObject *valobj,int *iserrp)
717 717
 	if (valobj == Py_None || sipIsSubClassInstance(valobj,sipClass_AmSipRequest))
718 718
 		return sipConvertToCpp(valobj,sipClass_AmSipRequest,iserrp);
719 719
 
720
-	sipBadClass(sipNm_py_sems_AmSipRequest);
720
+	sipBadClass(sipNm_py_sems_lib_AmSipRequest);
721 721
 
722 722
 	*iserrp = 1;
723 723
 
... ...
@@ -728,7 +728,7 @@ static void *forceConvertTo_AmSipRequest(PyObject *valobj,int *iserrp)
728 728
 /* The main type data structure. */
729 729
 sipTypeDef sipType_AmSipRequest = {
730 730
 	0,
731
-	"py_sems.AmSipRequest",
731
+	"py_sems_lib.AmSipRequest",
732 732
 	-1,
733 733
 	0,
734 734
 	0,
735 735
similarity index 50%
736 736
rename from apps/py_sems/sip/sippy_semsAmSipRequest.h
737 737
rename to apps/py_sems/sip/sippy_sems_libAmSipRequest.h
... ...
@@ -1,20 +1,20 @@
1 1
 /*
2 2
  * Interface header file.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#ifndef _py_semsAmSipRequest_h
8
-#define	_py_semsAmSipRequest_h
7
+#ifndef _py_sems_libAmSipRequest_h
8
+#define	_py_sems_libAmSipRequest_h
9 9
 
10 10
 #line 6 "AmSipRequest.sip"
11 11
 #include "../../../core/AmSipRequest.h"
12
-#line 13 "sippy_semsAmSipRequest.h"
12
+#line 13 "sippy_sems_libAmSipRequest.h"
13 13
 
14
-#include "sippy_semsstring.h"
14
+#include "sippy_sems_libstring.h"
15 15
 
16 16
 
17
-#define	sipClass_AmSipRequest	sipModuleAPI_py_sems.em_types[3]
17
+#define	sipClass_AmSipRequest	sipModuleAPI_py_sems_lib.em_types[3]
18 18
 #define	sipCast_AmSipRequest	sipType_AmSipRequest.td_cast
19 19
 #define	sipForceConvertTo_AmSipRequest	sipType_AmSipRequest.td_fcto
20 20
 
21 21
similarity index 62%
22 22
rename from apps/py_sems/sip/sippy_semsPySemsDialog.cpp
23 23
rename to apps/py_sems/sip/sippy_sems_libPySemsDialog.cpp
... ...
@@ -1,15 +1,15 @@
1 1
 /*
2 2
  * Interface wrapper code.
3 3
  *
4
- * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb  9 10:28:23 2007
4
+ * Generated by SIP 4.1.1 (4.1.1-255) on Fri Feb 16 10:10:16 2007
5 5
  */
6 6
 
7
-#include "sipAPIpy_sems.h"
8
-#include "sippy_semsPySemsDialog.h"
7
+#include "sipAPIpy_sems_lib.h"
8
+#include "sippy_sems_libPySemsDialog.h"
9 9
 
10 10
 sipPySemsDialog::sipPySemsDialog(): PySemsDialog(), sipPySelf(0)
11 11
 {
12
-	sipCommonCtor(sipPyMethods,7);
12
+	sipCommonCtor(sipPyMethods,5);
13 13
 }
14 14
 
15 15
 sipPySemsDialog::~sipPySemsDialog()
... ...
@@ -19,12 +19,12 @@ sipPySemsDialog::~sipPySemsDialog()
19 19
 
20 20
 void sipPySemsDialog::onInvite(const AmSipRequest& a0)
21 21
 {
22
-	extern void sipVH_py_sems_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
22
+	extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
23 23
 
24 24
 	sip_gilstate_t sipGILState;
25 25
 	PyObject *meth;
26 26
 
27
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[0],sipPySelf,NULL,sipNm_py_sems_onInvite);
27
+	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[0],sipPySelf,NULL,sipNm_py_sems_lib_onInvite);
28 28
 
29 29
 	if (!meth)
30 30
 	{
... ...
@@ -32,17 +32,17 @@ void sipPySemsDialog::onInvite(const AmSipRequest& a0)
32 32
 		return;
33 33
 	}
34 34
 
35
-	sipVH_py_sems_1(sipGILState,meth,a0);
35
+	sipVH_py_sems_lib_1(sipGILState,meth,a0);
36 36
 }
37 37
 
38 38
 void sipPySemsDialog::onSessionStart(const AmSipRequest& a0)
39 39
 {
40
-	extern void sipVH_py_sems_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
40
+	extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
41 41
 
42 42
 	sip_gilstate_t sipGILState;
43 43
 	PyObject *meth;
44 44
 
45
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[1],sipPySelf,NULL,sipNm_py_sems_onSessionStart);
45
+	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[1],sipPySelf,NULL,sipNm_py_sems_lib_onSessionStart);
46 46
 
47 47
 	if (!meth)
48 48
 	{
... ...
@@ -50,35 +50,17 @@ void sipPySemsDialog::onSessionStart(const AmSipRequest& a0)
50 50
 		return;
51 51
 	}
52 52
 
53
-	sipVH_py_sems_1(sipGILState,meth,a0);
54
-}
55
-
56
-void sipPySemsDialog::onBye(const AmSipRequest& a0)
57
-{
58
-	extern void sipVH_py_sems_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
59
-
60
-	sip_gilstate_t sipGILState;
61
-	PyObject *meth;
62
-
63
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[2],sipPySelf,NULL,sipNm_py_sems_onBye);
64
-
65
-	if (!meth)
66
-	{
67
-		PySemsDialog::onBye(a0);
68
-		return;
69
-	}
70
-
71
-	sipVH_py_sems_1(sipGILState,meth,a0);
53
+	sipVH_py_sems_lib_1(sipGILState,meth,a0);
72 54
 }
73 55
 
74 56
 void sipPySemsDialog::onCancel()
75 57
 {
76
-	extern void sipVH_py_sems_3(sip_gilstate_t,PyObject *);
58
+	extern void sipVH_py_sems_lib_2(sip_gilstate_t,PyObject *);
77 59
 
78 60
 	sip_gilstate_t sipGILState;
79 61
 	PyObject *meth;
80 62
 
81
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[3],sipPySelf,NULL,sipNm_py_sems_onCancel);
63
+	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[2],sipPySelf,NULL,sipNm_py_sems_lib_onCancel);
82 64
 
83 65
 	if (!meth)
84 66
 	{
... ...
@@ -86,61 +68,43 @@ void sipPySemsDialog::onCancel()
86 68
 		return;
87 69
 	}
88 70
 
89
-	sipVH_py_sems_3(sipGILState,meth);
90
-}
91
-
92
-void sipPySemsDialog::onDtmf(int a0,int a1)
93
-{
94
-	extern void sipVH_py_sems_2(sip_gilstate_t,PyObject *,int,int);
95
-
96
-	sip_gilstate_t sipGILState;
97
-	PyObject *meth;
98
-
99
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[4],sipPySelf,NULL,sipNm_py_sems_onDtmf);
100
-
101
-	if (!meth)
102
-	{
103
-		PySemsDialog::onDtmf(a0,a1);
104
-		return;
105
-	}
106
-
107
-	sipVH_py_sems_2(sipGILState,meth,a0,a1);
71
+	sipVH_py_sems_lib_2(sipGILState,meth);
108 72
 }
109 73
 
110
-void sipPySemsDialog::onOtherBye(const AmSipRequest& a0)
74
+void sipPySemsDialog::onBye(const AmSipRequest& a0)
111 75
 {
112
-	extern void sipVH_py_sems_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
76
+	extern void sipVH_py_sems_lib_1(sip_gilstate_t,PyObject *,const AmSipRequest&);
113 77
 
114 78
 	sip_gilstate_t sipGILState;
115 79
 	PyObject *meth;
116 80
 
117
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[5],sipPySelf,NULL,sipNm_py_sems_onOtherBye);
81
+	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[3],sipPySelf,NULL,sipNm_py_sems_lib_onBye);
118 82
 
119 83
 	if (!meth)
120 84
 	{
121
-		PySemsDialog::onOtherBye(a0);
85
+		PySemsDialog::onBye(a0);
122 86
 		return;
123 87
 	}
124 88
 
125
-	sipVH_py_sems_1(sipGILState,meth,a0);
89
+	sipVH_py_sems_lib_1(sipGILState,meth,a0);
126 90
 }
127 91
 
128
-void sipPySemsDialog::onOtherReply(const AmSipReply& a0)
92
+void sipPySemsDialog::onDtmf(int a0,int a1)
129 93
 {
130
-	extern void sipVH_py_sems_0(sip_gilstate_t,PyObject *,const AmSipReply&);
94
+	extern void sipVH_py_sems_lib_0(sip_gilstate_t,PyObject *,int,int);
131 95
 
132 96
 	sip_gilstate_t sipGILState;
133 97
 	PyObject *meth;
134 98
 
135
-	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[6],sipPySelf,NULL,sipNm_py_sems_onOtherReply);
99
+	meth = sipIsPyMethod(&sipGILState,&sipPyMethods[4],sipPySelf,NULL,sipNm_py_sems_lib_onDtmf);
136 100
 
137 101
 	if (!meth)
138 102
 	{
139
-		PySemsDialog::onOtherReply(a0);
103
+		PySemsDialog::onDtmf(a0,a1);
140 104
 		return;
141 105
 	}
142 106
 
143
-	sipVH_py_sems_0(sipGILState,meth,a0);
107
+	sipVH_py_sems_lib_0(sipGILState,meth,a0,a1);
144 108