Browse code

Merge branch 'master' into offer_answer

Raphael Coeffic authored on 13/10/2010 14:04:23
Showing 420 changed files
... ...
@@ -9,4 +9,5 @@ getarch
9 9
 getos
10 10
 sems
11 11
 sems-stats
12
-core/etc/*.conf
13 12
\ No newline at end of file
13
+core/etc/*.conf
14
+core/etc/*.template
... ...
@@ -1,7 +1,13 @@
1 1
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
2 2
 
3
-# Don't do automatic escaping of variables
4
-CMAKE_POLICY(SET CMP0005 OLD)
3
+IF(COMMAND cmake_policy)
4
+	# Don't do automatic escaping of variables
5
+	CMAKE_POLICY(SET CMP0005 OLD)
6
+ENDIF(COMMAND cmake_policy)
7
+
8
+
9
+# Add path for additional FindXXX.cmake scenarios
10
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
5 11
 
6 12
 PROJECT (SEMS)
7 13
 
... ...
@@ -9,8 +15,16 @@ SET(SEMS_MAJOR_VERSION 1)
9 15
 SET(SEMS_MINOR_VERSION 3)
10 16
 SET(SEMS_BUILD_VERSION 0)
11 17
 SET(SEMS_EXTRA_VERSION dev)
12
-SET(SEMS_VERSION
13
-    "${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}-${SEMS_EXTRA_VERSION}")
18
+
19
+IF(EXISTS ${CMAKE_SOURCE_DIR}/.git)
20
+	SET(SEMS_VERSION
21
+	    "${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}-${SEMS_EXTRA_VERSION}")
22
+ELSE(EXISTS ${CMAKE_SOURCE_DIR}/.git)
23
+	SET(SEMS_VERSION
24
+	    "${SEMS_MAJOR_VERSION}.${SEMS_MINOR_VERSION}.${SEMS_BUILD_VERSION}")
25
+ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/.git)
26
+
27
+MESSAGE(STATUS "Configuring ${CMAKE_PROJECT_NAME} v. ${SEMS_VERSION}")
14 28
 
15 29
 IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE)
16 30
 	message(FATAL_ERROR "In-source builds are not allowed.
... ...
@@ -74,38 +88,18 @@ SET(CMAKE_VERBOSE_MAKEFILE ON)
74 88
 #   will not work with spandsp 0.0.2 .
75 89
 #   (which means that current debian and gentoo packages don't work)
76 90
 IF(SEMS_USE_SPANDSP)
77
-	FIND_LIBRARY(SPANDSP_LIBRARIES NAMES spandsp)
78
-	FIND_PATH(SPANDSP_INCLUDE_DIR spandsp.h)
79
-	IF(SPANDSP_INCLUDE_DIR AND SPANDSP_LIBRARIES)
80
-		SET(SPANDSP_FOUND TRUE)
81
-		MESSAGE(STATUS "Found spandsp includes:	${SPANDSP_INCLUDE_DIR}/spandsp.h")
82
-		MESSAGE(STATUS "Found spandsp library: ${SPANDSP_LIBRARIES}")
83
-		MESSAGE(STATUS "Using spandsp: YES")
84
-	ELSE(SPANDSP_INCLUDE_DIR AND SPANDSP_LIBRARIES)
85
-		SET(SPANDSP_FOUND FALSE)
86
-		MESSAGE(FATAL_ERROR "Could NOT find spandsp development files")
87
-	ENDIF(SPANDSP_INCLUDE_DIR AND SPANDSP_LIBRARIES)
91
+	FIND_PACKAGE(Spandsp REQUIRED)
92
+	MESSAGE(STATUS "Using spandsp: YES")
88 93
 ELSE(SEMS_USE_SPANDSP)
89
-	SET(SPANDSP_FOUND FALSE)
90 94
 	MESSAGE(STATUS "Using spandsp: NO (default)")
91 95
 ENDIF(SEMS_USE_SPANDSP)
92 96
 
93 97
 # compile with sample rate conversion from secret rabbit code?
94 98
 # (see http://www.mega-nerd.com/SRC/)
95 99
 IF(SEMS_USE_LIBSAMPLERATE)
96
-	FIND_LIBRARY(LIBSAMPLERATE_LIBRARIES NAMES samplerate)
97
-	FIND_PATH(LIBSAMPLERATE_INCLUDE_DIR samplerate.h)
98
-	IF(LIBSAMPLERATE_INCLUDE_DIR AND LIBSAMPLERATE_LIBRARIES)
99
-		SET(LIBSAMPLERATE_FOUND TRUE)
100
-		MESSAGE(STATUS "Found libsamplerate includes: ${LIBSAMPLERATE_INCLUDE_DIR}/samplerate.h")
101
-		MESSAGE(STATUS "Found libsamplerate library: ${LIBSAMPLERATE_LIBRARIES}")
102
-		MESSAGE(STATUS "Using libsamplerate: YES")
103
-	ELSE(LIBSAMPLERATE_INCLUDE_DIR AND LIBSAMPLERATE_LIBRARIES)
104
-		SET(LIBSAMPLERATE_FOUND FALSE)
105
-		MESSAGE(FATAL_ERROR "Could NOT find libsamplerate development files")
106
-	ENDIF(LIBSAMPLERATE_INCLUDE_DIR AND LIBSAMPLERATE_LIBRARIES)
100
+	FIND_PACKAGE(Libsamplerate REQUIRED)
101
+	MESSAGE(STATUS "Using libsamplerate: YES")
107 102
 ELSE(SEMS_USE_LIBSAMPLERATE)
108
-	SET(LIBSAMPLERATE_FOUND FALSE)
109 103
 	MESSAGE(STATUS "Using libsamplerate: NO (default)")
110 104
 ENDIF(SEMS_USE_LIBSAMPLERATE)
111 105
 
... ...
@@ -122,19 +116,9 @@ ENDIF(SEMS_USE_ZRTP)
122 116
 
123 117
 # Lame MP3 support
124 118
 IF(SEMS_USE_MP3)
125
-	FIND_LIBRARY(LAME_LIBRARIES NAMES mp3lame)
126
-	FIND_PATH(LAME_INCLUDE_DIR lame/lame.h)
127
-	IF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
128
-		SET(LAME_FOUND TRUE)
129
-		MESSAGE(STATUS "Found lame mp3 includes: ${LAME_INCLUDE_DIR}/lame/lame.h")
130
-		MESSAGE(STATUS "Found lame mp3 library: ${LAME_LIBRARIES}")
131
-		MESSAGE(STATUS "Using lame mp3: YES")
132
-	ELSE(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
133
-		SET(LAME_FOUND FALSE)
134
-		MESSAGE(FATAL_ERROR "Could NOT find lame development files")
135
-	ENDIF(LAME_INCLUDE_DIR AND LAME_LIBRARIES)
119
+	FIND_PACKAGE(Lame REQUIRED)
120
+	MESSAGE(STATUS "Using lame mp3: YES")
136 121
 ELSE(SEMS_USE_MP3)
137
-	SET(LAME_FOUND FALSE)
138 122
 	MESSAGE(STATUS "Using lame mp3: NO (default)")
139 123
 ENDIF(SEMS_USE_MP3)
140 124
 
... ...
@@ -159,30 +143,20 @@ ELSE(SEMS_USE_IPV6)
159 143
 ENDIF(SEMS_USE_IPV6)
160 144
 
161 145
 # Let's try to find GSM library and header files
162
-FIND_LIBRARY(GSM_LIBRARIES NAMES gsm)
163
-FIND_PATH(GSM_INCLUDE_DIR gsm.h)
164
-IF(GSM_INCLUDE_DIR AND GSM_LIBRARIES)
165
-	SET(GSM_FOUND TRUE)
166
-	MESSAGE(STATUS "Found gsm includes: ${GSM_INCLUDE_DIR}/gsm.h")
167
-	MESSAGE(STATUS "Found gsm library: ${GSM_LIBRARIES}")
146
+FIND_PACKAGE(Gsm)
147
+IF(GSM_FOUND)
168 148
 	MESSAGE(STATUS "Using gsm: YES")
169
-ELSE(GSM_INCLUDE_DIR AND GSM_LIBRARIES)
170
-	SET(GSM_FOUND FALSE)
149
+ELSE(GSM_FOUND)
171 150
 	MESSAGE(STATUS "Using gsm: NO")
172
-ENDIF (GSM_INCLUDE_DIR AND GSM_LIBRARIES)
151
+ENDIF(GSM_FOUND)
173 152
 
174 153
 # Let's try to find SPEEX library and header files
175
-FIND_LIBRARY(SPEEX_LIBRARIES NAMES speex)
176
-FIND_PATH(SPEEX_INCLUDE_DIR speex/speex.h)
177
-IF(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES)
178
-	SET(SPEEX_FOUND TRUE)
179
-	MESSAGE(STATUS "Found speex includes: ${SPEEX_INCLUDE_DIR}/speex/speex.h")
180
-	MESSAGE(STATUS "Found speex library: ${SPEEX_LIBRARIES}")
154
+FIND_PACKAGE(Speex)
155
+IF(SPEEX_FOUND)
181 156
 	MESSAGE(STATUS "Using speex: YES")
182
-ELSE(SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES)
183
-	SET(SPEEX_FOUND FALSE)
157
+ELSE(SPEEX_FOUND)
184 158
 	MESSAGE(STATUS "Using speex: NO")
185
-ENDIF (SPEEX_INCLUDE_DIR AND SPEEX_LIBRARIES)
159
+ENDIF(SPEEX_FOUND)
186 160
 
187 161
 IF(SEMS_USE_OPENSSL)
188 162
 	FIND_PACKAGE(OpenSSL REQUIRED QUIETLY)
... ...
@@ -197,69 +171,54 @@ ENDIF(SEMS_USE_OPENSSL)
197 171
 FIND_PACKAGE(PythonLibs)
198 172
 IF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
199 173
 	SET(PYTHONLIBS_FOUND TRUE)
200
-	GET_FILENAME_COMPONENT(PYTHON_LD_PATH ${PYTHON_LIBRARIES} PATH)
201 174
 	MESSAGE(STATUS "Found Python includes:	${PYTHON_INCLUDE_PATH}/Python.h")
202 175
 	MESSAGE(STATUS "Found Python library: ${PYTHON_LIBRARIES}")
203
-	MESSAGE(STATUS "Found Python library path: ${PYTHON_LD_PATH}")
204 176
 	MESSAGE(STATUS "Using Python: YES")
205 177
 ELSE(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
206 178
 	MESSAGE(STATUS "Using Python: NO")
207 179
 ENDIF(PYTHONLIBS_FOUND OR PYTHON_LIBRARIES)
208 180
 
209 181
 # Let's try to find SIP (Python bindings generator) development files
210
-FIND_PATH(SIP_INCLUDE_DIR sip.h PATHS ${PYTHON_INCLUDE_PATH})
211
-IF(SIP_INCLUDE_DIR)
212
-	SET(SIP_FOUND TRUE)
213
-	MESSAGE(STATUS "Found SIP includes:	${SIP_INCLUDE_DIR}/sip.h")
182
+FIND_PACKAGE(SIP)
183
+IF(SIP_FOUND)
214 184
 	MESSAGE(STATUS "Using SIP: YES")
215
-ELSE(SIP_INCLUDE_DIR)
216
-	SET(SIP_FOUND FALSE)
185
+ELSE(SIP_FOUND)
217 186
 	MESSAGE(STATUS "Using SIP: NO")
218
-ENDIF(SIP_INCLUDE_DIR)
187
+ENDIF(SIP_FOUND)
219 188
 
220 189
 # Let's try to find MySQL++ development files
221
-FIND_LIBRARY(MYSQLPP_LIBRARIES NAMES mysqlpp)
222
-FIND_PATH(MYSQLPP_INCLUDE_DIR mysql++/mysql++.h)
223
-IF(MYSQLPP_INCLUDE_DIR AND MYSQLPP_LIBRARIES)
224
-	SET(MYSQLPP_FOUND TRUE)
225
-	MESSAGE(STATUS "Found MySQL++ includes:	${MYSQLPP_INCLUDE_DIR}/mysql++/mysql++.h")
226
-	MESSAGE(STATUS "Found MySQL++ library: ${MYSQLPP_LIBRARIES}")
190
+FIND_PACKAGE(MySQLpp)
191
+IF(MYSQLPP_FOUND)
227 192
 	MESSAGE(STATUS "Using MySQL++: YES")
228
-ELSE(MYSQLPP_INCLUDE_DIR AND MYSQLPP_LIBRARIES)
229
-	SET(MYSQLPP_FOUND FALSE)
193
+ELSE(MYSQLPP_FOUND)
230 194
 	MESSAGE(STATUS "Using MySQL++: NO")
231
-ENDIF(MYSQLPP_INCLUDE_DIR AND MYSQLPP_LIBRARIES)
195
+ENDIF(MYSQLPP_FOUND)
232 196
 
233 197
 # Let's try to find Flite library and header files
234 198
 IF(SEMS_USE_TTS)
235
-	FIND_LIBRARY(FLITE_LIBRARIES NAMES flite)
236
-	FIND_PATH(FLITE_INCLUDE_DIR flite/flite.h)
237
-	IF(FLITE_INCLUDE_DIR AND FLITE_LIBRARIES)
238
-		SET(FLITE_FOUND TRUE)
239
-		MESSAGE(STATUS "Found flite includes: ${FLITE_INCLUDE_DIR}/flite/flite.h")
240
-		MESSAGE(STATUS "Found flite library: ${FLITE_LIBRARIES}")
241
-		MESSAGE(STATUS "Using flite: YES")
242
-	ELSE(FLITE_INCLUDE_DIR AND FLITE_LIBRARIES)
243
-		SET(FLITE_FOUND FALSE)
244
-		MESSAGE(FATAL_ERROR "CANNOT find flite devel files")
245
-	ENDIF (FLITE_INCLUDE_DIR AND FLITE_LIBRARIES)
199
+	FIND_PACKAGE(Flite REQUIRED)
200
+	MESSAGE(STATUS "Using text-to-speech: YES")
246 201
 ELSE(SEMS_USE_TTS)
247 202
 	SET(FLITE_FOUND FALSE)
248 203
 	MESSAGE(STATUS "Using text-to-speech: NO (default)")
249 204
 ENDIF(SEMS_USE_TTS)
250 205
 
251 206
 # Let's try to find mISDN library and header files
252
-FIND_LIBRARY(MISDN_LIBRARIES NAMES mISDN)
253
-FIND_PATH(MISDN_INCLUDE_DIR mISDNuser/mISDNlib.h)
254
-IF(MISDN_INCLUDE_DIR AND MISDN_LIBRARIES)
255
-	SET(MISDN_FOUND TRUE)
256
-	MESSAGE(STATUS "Found mISDN includes: ${MISDN_INCLUDE_DIR}/mISDNuser/mISDNlib.h")
257
-	MESSAGE(STATUS "Found mISDN library: ${MISDN_LIBRARIES}")
207
+FIND_PACKAGE(MISDN)
208
+IF(MISDN_FOUND)
258 209
 	MESSAGE(STATUS "Using mISDN: YES")
259
-ELSE(MISDN_INCLUDE_DIR AND MISDN_LIBRARIES)
260
-	SET(MISDN_FOUND FALSE)
210
+ELSE(MISDN_FOUND)
261 211
 	MESSAGE(STATUS "Using mISDN: NO")
262
-ENDIF (MISDN_INCLUDE_DIR AND MISDN_LIBRARIES)
212
+ENDIF(MISDN_FOUND)
213
+
214
+# Let's try to find libev development files
215
+FIND_PACKAGE(Libev)
216
+IF(LIBEV_FOUND)
217
+	MESSAGE(STATUS "Using libev: YES")
218
+ELSE(LIBEV_FOUND)
219
+	MESSAGE(STATUS "Using libev: NO")
220
+ENDIF(LIBEV_FOUND)
221
+
263 222
 
264 223
 INCLUDE_DIRECTORIES (${SEMS_SOURCE_DIR}/core/ampi)
265 224
 INCLUDE_DIRECTORIES (${SEMS_SOURCE_DIR}/core/amci)
... ...
@@ -55,6 +55,7 @@ tar:
55 55
 		--exclude=$(notdir $(CURDIR))/tmp \
56 56
 		--exclude=core/$(notdir $(CURDIR))/tmp \
57 57
 		--exclude=.svn* \
58
+		--exclude=.git* \
58 59
 		--exclude=.\#* \
59 60
 		--exclude=*.[do] \
60 61
 		--exclude=*.la \
... ...
@@ -1,4 +1,4 @@
1
-ifeq ($(makefile_defs), 1)
1
+ifeq ($(makefile_defs),1)
2 2
 else
3 3
 makefile_defs=1
4 4
 export makefile_defs
... ...
@@ -20,7 +20,7 @@ endif
20 20
 
21 21
 #version number
22 22
 VERSION = 1
23
-PATCHLEVEL = 3
23
+PATCHLEVEL = 4
24 24
 SUBLEVEL = 0
25 25
 
26 26
 ifneq ($(SCM_REV),)
... ...
@@ -76,7 +76,7 @@ CPPFLAGS += -D_DEBUG \
76 76
 # exclude some modules from compilation?
77 77
 # e.g. python modules:
78 78
 
79
-exclude_core_modules = sipctrl
79
+exclude_core_modules = sipctrl g729
80 80
 #exclude_apps_modules = py_sems ivr mailbox pin_collect conf_auth mp3 examples
81 81
 
82 82
 # build in support for monitoring?
... ...
@@ -260,7 +260,7 @@ LIB_LDFLAGS += $(LDFLAGS)
260 260
 
261 261
 DESTDIR ?= 
262 262
 PREFIX ?= /usr/local
263
-prefix = $(PREFIX)
263
+prefix ?= $(PREFIX)
264 264
 BASEDIR ?=
265 265
 basedir = $(BASEDIR)
266 266
 
... ...
@@ -309,7 +309,8 @@ endif
309 309
 
310 310
 # target dirs for various stuff
311 311
 bin-target = $(prefix)/$(bin-dir)
312
-cfg-target = $(prefix)/$(cfg-dir)
312
+cfg-target ?= $(prefix)/$(cfg-dir)
313
+app-cfg-target = $(cfg-target)etc/
313 314
 modules-target = $(prefix)/$(modules-dir)
314 315
 audio-target = $(prefix)/$(audio-dir)
315 316
 lib-target = $(prefix)/$(lib-dir)
... ...
@@ -339,7 +340,7 @@ export DESTDIR PREFIX prefix basedir ser-prefix
339 340
 export start-script
340 341
 export cfg-prefix bin-prefix modules-prefix doc-prefix audio-prefix lib-prefix
341 342
 export cfg-dir bin-dir modules-dir audio-dir lib-dir doc-dir man-dir
342
-export bin-target cfg-target modules-target audio-target lib-target
343
+export bin-target cfg-target app-cfg-target modules-target audio-target lib-target
343 344
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
344 345
 
345 346
 export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR 
... ...
@@ -350,6 +351,7 @@ export exclude_core_modules exclude_app_modules
350 351
 endif  # ifeq ($(makefile_defs, 1)
351 352
 
352 353
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
354
+		 $(DESTDIR)$(app-cfg-target) \
353 355
 		 $(DESTDIR)$(bin-prefix)/$(bin-dir) \
354 356
 		 $(DESTDIR)$(modules-prefix)/$(modules-dir) \
355 357
 		 $(DESTDIR)$(audio-prefix)/$(audio-dir) \
... ...
@@ -358,6 +360,9 @@ mk-install-dirs: $(DESTDIR)$(cfg-target) \
358 360
 $(DESTDIR)$(cfg-target): 
359 361
 	mkdir -p $(DESTDIR)$(cfg-target)
360 362
 
363
+$(DESTDIR)$(app-cfg-target): 
364
+	mkdir -p $(DESTDIR)$(app-cfg-target)
365
+
361 366
 $(DESTDIR)$(bin-prefix)/$(bin-dir):
362 367
 	mkdir -p $(DESTDIR)$(bin-prefix)/$(bin-dir)
363 368
 
... ...
@@ -40,7 +40,9 @@ Introduction:
40 40
 License:
41 41
 
42 42
  SEMS is free (speech+beer) software. It is licensed under dual 
43
- license terms, the GPL (v2+) and proprietary license.
43
+ license terms, the GPL (v2+) and proprietary license. This program
44
+ is released under the GPL with the additional exemption that
45
+ compiling, linking, and/or using OpenSSL is allowed.
44 46
 
45 47
  See doc/COPYING for details.
46 48
 
... ...
@@ -22,6 +22,9 @@ ENDIF(MISDN_FOUND)
22 22
 IF(PYTHONLIBS_FOUND)
23 23
 	ADD_SUBDIRECTORY(ivr)
24 24
 ENDIF(PYTHONLIBS_FOUND)
25
+IF(LIBEV_FOUND)
26
+	ADD_SUBDIRECTORY(jsonrpc)
27
+ENDIF(LIBEV_FOUND)
25 28
 IF(PYTHONLIBS_FOUND)
26 29
 	ADD_SUBDIRECTORY(mailbox)
27 30
 ENDIF(PYTHONLIBS_FOUND)
... ...
@@ -34,13 +37,14 @@ IF(PYTHONLIBS_FOUND)
34 37
 	ADD_SUBDIRECTORY(pin_collect)
35 38
 ENDIF(PYTHONLIBS_FOUND)
36 39
 ADD_SUBDIRECTORY(precoded_announce)
37
-#IF(PYTHONLIBS_FOUND)
38
-#IF(SIP_FOUND)
39
-#	ADD_SUBDIRECTORY(py_sems)
40
-#ENDIF(SIP_FOUND)
41
-#ENDIF(PYTHONLIBS_FOUND)
40
+IF(PYTHONLIBS_FOUND)
41
+IF(SIP_FOUND)
42
+	ADD_SUBDIRECTORY(py_sems)
43
+ENDIF(SIP_FOUND)
44
+ENDIF(PYTHONLIBS_FOUND)
42 45
 ADD_SUBDIRECTORY(reg_agent)
43 46
 ADD_SUBDIRECTORY(registrar_client)
47
+ADD_SUBDIRECTORY(sst_b2b)
44 48
 ADD_SUBDIRECTORY(sw_prepaid_sip)
45 49
 #IF(PYTHONLIBS_FOUND)
46 50
 #	ADD_SUBDIRECTORY(twit)
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -4,4 +4,3 @@ AnnounceB2B.cpp
4 4
 
5 5
 SET(sems_module_name ann_b2b)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,12 +1,10 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  * Copyright (C) 2006 iptego GmbH
6 4
  *
7
- * This file is part of sems, a free SIP media server.
5
+ * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12 10
  * (at your option) any later version.
... ...
@@ -16,7 +14,7 @@
16 14
  * software, please contact iptel.org by e-mail at the following addresses:
17 15
  *    info@iptel.org
18 16
  *
19
- * sems is distributed in the hope that it will be useful,
17
+ * SEMS is distributed in the hope that it will be useful,
20 18
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22 20
  * GNU General Public License for more details.
... ...
@@ -1,12 +1,10 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  * Copyright (C) 2006 iptego GmbH
6 4
  *
7
- * This file is part of sems, a free SIP media server.
5
+ * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12 10
  * (at your option) any later version.
... ...
@@ -16,7 +14,7 @@
16 14
  * software, please contact iptel.org by e-mail at the following addresses:
17 15
  *    info@iptel.org
18 16
  *
19
- * sems is distributed in the hope that it will be useful,
17
+ * SEMS is distributed in the hope that it will be useful,
20 18
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22 20
  * GNU General Public License for more details.
... ...
@@ -4,4 +4,3 @@ AnnounceTransfer.cpp
4 4
 
5 5
 SET(sems_module_name announce_transfer)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -4,4 +4,3 @@ Announcement.cpp
4 4
 
5 5
 SET(sems_module_name announcement)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -2,7 +2,7 @@ set (annrecorder_SRCS
2 2
 AnnRecorder.cpp
3 3
 )
4 4
 
5
-set (audio_files
5
+set (annrecorder_audio_files
6 6
 beep.wav
7 7
 bye.wav
8 8
 confirm.wav
... ...
@@ -14,5 +14,3 @@ your_prompt.wav
14 14
 
15 15
 SET(sems_module_name annrecorder)
16 16
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
17
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt)
18
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,13 +1,11 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  * Based on the concept of mycc, Copyright (C) 2007 Sipwise GmbH
6 4
  * Based on the concept of sw_prepaid_sip, Copyright (C) 2002-2003 Fhg Fokus
7 5
  *
8
- * This file is part of sems, a free SIP media server.
6
+ * This file is part of SEMS, a free SIP media server.
9 7
  *
10
- * sems is free software; you can redistribute it and/or modify
8
+ * SEMS is free software; you can redistribute it and/or modify
11 9
  * it under the terms of the GNU General Public License as published by
12 10
  * the Free Software Foundation; either version 2 of the License, or
13 11
  * (at your option) any later version.
... ...
@@ -17,7 +15,7 @@
17 15
  * software, please contact iptel.org by e-mail at the following addresses:
18 16
  *    info@iptel.org
19 17
  *
20
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
21 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
22 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
23 21
  * GNU General Public License for more details.
... ...
@@ -1,13 +1,11 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  * Based on the concept of sw_prepaid_sip, Copyright (C) 2007 Sipwise GmbH
6 4
  * Based on the concept of mycc, Copyright (C) 2002-2003 Fhg Fokus
7 5
  *
8
- * This file is part of sems, a free SIP media server.
6
+ * This file is part of SEMS, a free SIP media server.
9 7
  *
10
- * sems is free software; you can redistribute it and/or modify
8
+ * SEMS is free software; you can redistribute it and/or modify
11 9
  * it under the terms of the GNU General Public License as published by
12 10
  * the Free Software Foundation; either version 2 of the License, or
13 11
  * (at your option) any later version.
... ...
@@ -17,7 +15,7 @@
17 15
  * software, please contact iptel.org by e-mail at the following addresses:
18 16
  *    info@iptel.org
19 17
  *
20
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
21 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
22 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
23 21
  * GNU General Public License for more details.
... ...
@@ -4,4 +4,3 @@ AuthB2B.cpp
4 4
 
5 5
 SET(sems_module_name auth_b2b)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
8 7
new file mode 100644
... ...
@@ -0,0 +1,7 @@
1
+
2
+# Account to use on the outgoing call leg. If this is not set,
3
+# the account is taken from P-App-Param header (see Readme.auth_b2b)
4
+#
5
+# user=someuser
6
+# domain=somedomain.net
7
+# pwd=sompwd
... ...
@@ -4,4 +4,3 @@ CallTimer.cpp
4 4
 
5 5
 SET(sems_module_name call_timer)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,14 +1,12 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  * Based on the concept of auth_b2b, Copyright (C) 2008 iptego GmbH
6 4
  * Based on the concept of mycc, Copyright (C) 2007 Sipwise GmbH
7 5
  * Based on the concept of sw_prepaid_sip, Copyright (C) 2002-2003 Fhg Fokus
8 6
  *
9
- * This file is part of sems, a free SIP media server.
7
+ * This file is part of SEMS, a free SIP media server.
10 8
  *
11
- * sems is free software; you can redistribute it and/or modify
9
+ * SEMS is free software; you can redistribute it and/or modify
12 10
  * it under the terms of the GNU General Public License as published by
13 11
  * the Free Software Foundation; either version 2 of the License, or
14 12
  * (at your option) any later version.
... ...
@@ -18,7 +16,7 @@
18 16
  * software, please contact iptel.org by e-mail at the following addresses:
19 17
  *    info@iptel.org
20 18
  *
21
- * sems is distributed in the hope that it will be useful,
19
+ * SEMS is distributed in the hope that it will be useful,
22 20
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
23 21
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24 22
  * GNU General Public License for more details.
... ...
@@ -1,14 +1,12 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  * Based on the concept of auth_b2b, Copyright (C) 2008 iptego GmbH
6 4
  * Based on the concept of sw_prepaid_sip, Copyright (C) 2007 Sipwise GmbH
7 5
  * Based on the concept of mycc, Copyright (C) 2002-2003 Fhg Fokus
8 6
  *
9
- * This file is part of sems, a free SIP media server.
7
+ * This file is part of SEMS, a free SIP media server.
10 8
  *
11
- * sems is free software; you can redistribute it and/or modify
9
+ * SEMS is free software; you can redistribute it and/or modify
12 10
  * it under the terms of the GNU General Public License as published by
13 11
  * the Free Software Foundation; either version 2 of the License, or
14 12
  * (at your option) any later version.
... ...
@@ -18,7 +16,7 @@
18 16
  * software, please contact iptel.org by e-mail at the following addresses:
19 17
  *    info@iptel.org
20 18
  *
21
- * sems is distributed in the hope that it will be useful,
19
+ * SEMS is distributed in the hope that it will be useful,
22 20
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
23 21
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
24 22
  * GNU General Public License for more details.
25 23
new file mode 100644
... ...
@@ -0,0 +1,13 @@
1
+
2
+#
3
+# use_app_param=[yes|no]
4
+#
5
+# sets whether App-Param header is used for call time value
6
+# (or default_call_time below)
7
+#
8
+use_app_param=yes
9
+
10
+#
11
+# call timer value used if not in P-App-Param. in seconds
12
+#
13
+default_call_time=1200
0 14
\ No newline at end of file
... ...
@@ -4,4 +4,3 @@ CallBack.cpp
4 4
 
5 5
 SET(sems_module_name callback)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007 iptego GmbH
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007 iptego GmbH
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -4,4 +4,3 @@ Click2Dial.cpp
4 4
 
5 5
 SET(sems_module_name click2dial)
6 6
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
7
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,12 +1,10 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007 Sipwise GmbH
5 3
  * Based on the concept of "announcement", Copyright (C) 2002-2003 Fhg Fokus
6 4
  *
7
- * This file is part of sems, a free SIP media server.
5
+ * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12 10
  * (at your option) any later version.
... ...
@@ -16,7 +14,7 @@
16 14
  * software, please contact iptel.org by e-mail at the following addresses:
17 15
  *    info@iptel.org
18 16
  *
19
- * sems is distributed in the hope that it will be useful,
17
+ * SEMS is distributed in the hope that it will be useful,
20 18
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22 20
  * GNU General Public License for more details.
... ...
@@ -1,12 +1,10 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007 Sipwise GmbH
5 3
  * Based on the concept of "announcement", Copyright (C) 2002-2003 Fhg Fokus
6 4
  *
7
- * This file is part of sems, a free SIP media server.
5
+ * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12 10
  * (at your option) any later version.
... ...
@@ -16,7 +14,7 @@
16 14
  * software, please contact iptel.org by e-mail at the following addresses:
17 15
  *    info@iptel.org
18 16
  *
19
- * sems is distributed in the hope that it will be useful,
17
+ * SEMS is distributed in the hope that it will be useful,
20 18
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22 20
  * GNU General Public License for more details.
... ...
@@ -3,3 +3,4 @@ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
3 3
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/python.rules.txt)
4 4
 
5 5
 PYTHON_SOURCES_COMPILE(conf_auth.py ivr)
6
+SEMS_INSTALL_CONFIGS(conf_auth)
6 7
new file mode 100644
... ...
@@ -2,7 +2,7 @@ set (conference_SRCS
2 2
 Conference.cpp
3 3
 )
4 4
 
5
-set (audio_files
5
+set (conference_audio_files
6 6
 beep.wav
7 7
 first_participant.wav
8 8
 )
... ...
@@ -22,5 +22,3 @@ ENDIF(MYSQLPP_FOUND)
22 22
 
23 23
 SET(sems_module_name conference)
24 24
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
25
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/audio.rules.txt)
26
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
... ...
@@ -1,12 +1,10 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  * Copyright (C) 2007 Juha Heinanen (USE_MYSQL parts)
6 4
  *
7
- * This file is part of sems, a free SIP media server.
5
+ * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12 10
  * (at your option) any later version.
... ...
@@ -16,7 +14,7 @@
16 14
  * software, please contact iptel.org by e-mail at the following addresses:
17 15
  *    info@iptel.org
18 16
  *
19
- * sems is distributed in the hope that it will be useful,
17
+ * SEMS is distributed in the hope that it will be useful,
20 18
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
21 19
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
22 20
  * GNU General Public License for more details.
... ...
@@ -1,11 +1,9 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 Fhg Fokus
5 3
  *
6
- * This file is part of sems, a free SIP media server.
4
+ * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11 9
  * (at your option) any later version.
... ...
@@ -15,7 +13,7 @@
15 13
  * software, please contact iptel.org by e-mail at the following addresses:
16 14
  *    info@iptel.org
17 15
  *
18
- * sems is distributed in the hope that it will be useful,
16
+ * SEMS is distributed in the hope that it will be useful,
19 17
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 18
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 19
  * GNU General Public License for more details.
... ...
@@ -33,3 +33,37 @@ playout_type=adaptive_playout
33 33
 #default:
34 34
 # use_rfc4240_rooms=no
35 35
 #
36
+
37
+###############################################################
38
+# RFC4028 Session Timer
39
+#
40
+
41
+# - enables the session timer ([yes,no]; default: no)
42
+# 
43
+# enable_session_timer=yes
44
+
45
+# - set the "Session-Expires" parameter for the session timer.
46
+#
47
+# session_expires=240
48
+
49
+# - set the "Min-SE" parameter for the session timer.
50
+#
51
+# minimum_timer=90
52
+
53
+# session refresh (Session Timer, RFC4028) method
54
+#
55
+# INVITE                 - use re-INVITE
56
+# UPDATE                 - use UPDATE
57
+# UPDATE_FALLBACK_INVITE - use UPDATE if indicated in Allow, re-INVITE otherwise
58
+#
59
+# Default: UPDATE_FALLBACK_INVITE
60
+#
61
+# Note: Session Timers are only supported in some applications
62
+#
63
+#session_refresh_method=UPDATE
64
+
65
+# accept_501_reply - accept 501 reply as successful refresh? [yes|no]
66
+#
67
+# Default: yes
68
+#
69
+#accept_501_reply=no
... ...
@@ -1,21 +1,21 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007-2009 IPTEGO GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
15 15
  * software, please contact iptel.org by e-mail at the following addresses:
16 16
  *    info@iptel.org
17 17
  *
18
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
19 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 21
  * GNU General Public License for more details.
... ...
@@ -1,21 +1,21 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007-2009 IPTEGO GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
15 15
  * software, please contact iptel.org by e-mail at the following addresses:
16 16
  *    info@iptel.org
17 17
  *
18
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
19 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 21
  * GNU General Public License for more details.
... ...
@@ -1,21 +1,21 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007-2009 IPTEGO GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
15 15
  * software, please contact iptel.org by e-mail at the following addresses:
16 16
  *    info@iptel.org
17 17
  *
18
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
19 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 21
  * GNU General Public License for more details.
... ...
@@ -1,21 +1,21 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2007-2009 IPTEGO GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
15 15
  * software, please contact iptel.org by e-mail at the following addresses:
16 16
  *    info@iptel.org
17 17
  *
18
- * sems is distributed in the hope that it will be useful,
18
+ * SEMS is distributed in the hope that it will be useful,
19 19
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 20
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
21 21
  * GNU General Public License for more details.
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2002-2003 FhG Fokus
5 3
  *
6 4
  * This file is part of disc, a free diameter server/client.
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * 2003-04-07 created by bogdan
5 3
  *
6 4
  * Copyright (C) 2002-2003 FhG Fokus
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * 2003-04-07 created by bogdan
5 3
  *
6 4
  * Copyright (C) 2002-2003 FhG Fokus
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2001-2003 FhG Fokus
5 3
  *
6 4
  * This file is part of ser, a free SIP server.
... ...
@@ -8,9 +6,11 @@
8 6
  * ser is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13
- * For a license to use the ser software under conditions
13
+ * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
15 15
  * software, please contact iptel.org by e-mail at the following addresses:
16 16
  *    info@iptel.org
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Digest Authentication - Diameter support
5 3
  *
6 4
  * Copyright (C) 2001-2003 FhG Fokus
... ...
@@ -13,7 +11,7 @@
13 11
  * the Free Software Foundation; either version 2 of the License, or
14 12
  * (at your option) any later version
15 13
  * 
16
- * For a license to use the ser software under conditions
14
+ * For a license to use the SEMS software under conditions
17 15
  * other than those described here, or to purchase support for this
18 16
  * software, please contact iptel.org by e-mail at the following addresses:
19 17
  *    info@iptel.org
... ...
@@ -1,6 +1,4 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Digest Authentication - Diameter support
5 3
  *
6 4
  * Copyright (C) 2001-2003 FhG Fokus
... ...
@@ -13,7 +11,7 @@
13 11
  * the Free Software Foundation; either version 2 of the License, or
14 12
  * (at your option) any later version
15 13
  * 
16
- * For a license to use the ser software under conditions
14
+ * For a license to use the SEMS software under conditions
17 15
  * other than those described here, or to purchase support for this
18 16
  * software, please contact iptel.org by e-mail at the following addresses:
19 17
  *    info@iptel.org
... ...
@@ -4,13 +4,11 @@ ADD_SUBDIRECTORY (lib)
4 4
 ADD_SUBDIRECTORY (mods)
5 5
 
6 6
 SET(sems_module_name dsm)
7
-SET(sems_config_files dsm_in_prompts dsm_out_prompts)
8
-SET(doc_files
7
+SET(dsm_config_files dsm dsm_in_prompts dsm_out_prompts)
8
+SET(dsm_doc_files
9 9
 	../../doc/dsm/Readme.dsm.txt
10 10
 	../../doc/dsm/dsm_syntax.txt
11 11
 	../../doc/dsm/dsm_todo.txt
12 12
 )
13
-SET(doc_dirs ../../doc/dsm/examples)
13
+SET(dsm_doc_dirs ../../doc/dsm)
14 14
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
15
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/config.rules.txt)
16
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake/doc.rules.txt)
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -340,6 +340,15 @@ void DSMCall::onSipReply(const AmSipReply& reply, AmSipDialog::Status old_dlg_st
340 340
   }
341 341
 }
342 342
 
343
+void DSMCall::onSystemEvent(AmSystemEvent* ev) {
344
+  map<string, string> params;
345
+  params["type"] = AmSystemEvent::getDescription(ev->sys_event);
346
+  engine.runEvent(this, this, DSMCondition::System, &params);
347
+  if (params["processed"] != DSM_TRUE) {
348
+    AmB2BCallerSession::onSystemEvent(ev);
349
+  }
350
+}
351
+
343 352
 void DSMCall::process(AmEvent* event)
344 353
 {
345 354
 
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -85,6 +85,8 @@ public:
85 85
   void onSipRequest(const AmSipRequest& req);
86 86
   void onSipReply(const AmSipReply& reply, AmSipDialog::Status old_dlg_status);
87 87
 
88
+  void onSystemEvent(AmSystemEvent* ev);
89
+
88 90
   void process(AmEvent* event);
89 91
 
90 92
   UACAuthCred* getCredentials();
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -1,15 +1,15 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  * Copyright (C) 2010 Stefan Sayer
6 4
  *
7 5
  * This file is part of SEMS, a free SIP media server.
8 6
  *
9
- * sems is free software; you can redistribute it and/or modify
7
+ * SEMS is free software; you can redistribute it and/or modify
10 8
  * it under the terms of the GNU General Public License as published by
11 9
  * the Free Software Foundation; either version 2 of the License, or
12
- * (at your option) any later version
10
+ * (at your option) any later version. This program is released under
11
+ * the GPL with the additional exemption that compiling, linking,
12
+ * and/or using OpenSSL is allowed.
13 13
  *
14 14
  * For a license to use the SEMS software under conditions
15 15
  * other than those described here, or to purchase support for this
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8
- * sems is free software; you can redistribute it and/or modify
6
+ * SEMS is free software; you can redistribute it and/or modify
9 7
  * it under the terms of the GNU General Public License as published by
10 8
  * the Free Software Foundation; either version 2 of the License, or
11
- * (at your option) any later version
9
+ * (at your option) any later version. This program is released under
10
+ * the GPL with the additional exemption that compiling, linking,
11
+ * and/or using OpenSSL is allowed.
12 12
  *
13 13
  * For a license to use the SEMS software under conditions
14 14
  * other than those described here, or to purchase support for this
... ...
@@ -1,14 +1,14 @@
1 1
 /*
2
- * $Id$
3
- *
4 2
  * Copyright (C) 2008 iptego GmbH
5 3
  *
6 4
  * This file is part of SEMS, a free SIP media server.
7 5
  *
8