Browse code

Merge branch 'master' into oej/routeblocks

* master: (70 commits)
core: made a wrapper forward_reply_nocb()
sl: use forward_reply_nocb() for sl_forward_reply()
core: end simple pv name (e.g., $xy) at end of line
db_cassandra: Replaced 'openser' with 'kamailio'
core: default compatibility set to SR_COMPAT_MAX
correct url to libjson in json and jsonrpc-c module docs
pkg/kamailio/(centos|fedora): Removed old FC16 build
lib/srdb1: update custom sql functions for uid tables
kamctl: added option to grant sql access from a remote host
kamctl: added option to creat uid-related tables
kamctl: cleaned db creation
json: proper handling of empty values for json documents
modules:sipcapture Added PSQL schema, fixed columns length, fixed id column for PostgreSQL
pua_reginfo: fix setting lengths of contact attributes
siputils: fix decode2format fuction to handle ; in userpart
modules:sipcapture Changed authorization column to "auth". Now PostgreSQL should be happy.
kamdbctl: fix presence tables provisioning
app_python: reverted changes (dlflags)
pkg/kamailio/fedora: added build files for Fedora 18
README remove "modules_k"
...

Olle E. Johansson authored on 25/01/2013 17:58:42
Showing 1594 changed files
... ...
@@ -131,6 +131,13 @@ W: http://www.ohlmeier.org
131 131
 P: BAD6CA40   B5E7 4FB0 800F 0A2C E3E9  4073 C7C3 F275 BAD6 CA40
132 132
 D:
133 133
 
134
+N: Olle E. JOhansson
135
+C: oej
136
+E: oej@edvina.net
137
+W: http://edvina.net
138
+P: 
139
+D:
140
+
134 141
 N: Peter Griffiths
135 142
 C: 
136 143
 E:
... ...
@@ -3,10 +3,10 @@ $Id$
3 3
 
4 4
      ==================================================
5 5
 
6
-     SIP Express Router and Kamailio Installation Notes
6
+          Kamailio Installation Notes
7 7
 
8
+	     http://www.kamailio.org
8 9
              http://sip-router.org
9
-			 http://www.kamailio.org
10 10
 
11 11
      ==================================================
12 12
 
... ...
@@ -51,9 +51,10 @@ The two major SIP server flavours are:
51 51
   - Kamailio (former OpenSER)
52 52
 
53 53
 Starting with version 3.0.0, the two SIP server flavours are built from
54
-same source code tree.
54
+same source code tree. In version 4.0.0 the two source code trees was
55
+merged even more, so a combined module directory is now used.
55 56
 
56
-SER flavor is the one built by default - historically speaking, it is the
57
+Kamailio flavor is the one built by default. SER is, historically speaking, the
57 58
 first open source SIP server started in 2001. Kamailio forked from SER in
58 59
 2005 under the initial name OpenSER.
59 60
 
... ...
@@ -62,6 +63,10 @@ very few, Kamailio enabling next compile time flags:
62 63
   - internal statistics
63 64
   - application server extensions in tm module
64 65
 
66
+In version 4.0.0 the modules were merged into one set and the merger
67
+between the two products was completed. Kamailio is now the main
68
+flavour.
69
+
65 70
 Switching between flavours is a matter of 'make' command parameters.
66 71
 
67 72
 Several installation tutorials for Kamailio are available on the web wiki:
... ...
@@ -130,6 +135,7 @@ Requirements:
130 135
 - libpcre libs and devel headers - if you want to compile the lcr and dialplan
131 136
   modules
132 137
 - libsctp devel headers - if you want to compile the SCTP transport in the core
138
+- linunistring - for the Websockets module
133 139
 
134 140
 
135 141
 OS Notes:
... ...
@@ -252,11 +258,8 @@ B) Build Commands
252 258
 	make
253 259
 
254 260
 Compile modules except some explicitly excepted (see below)
255
-	make modules  - all modules in the modules/ directory (common modules)
256
-	make modules_s - all modules in the modules_s/ directory (ser modules)
257
-	make modules_k - all modules in the modules_k/ directory (kamailio modules)
258
-	make modules-all or make every-module  - all the modules (modules, modules_s
259
-                                         and module_k)
261
+	make modules  - all modules in the modules/ directory 
262
+	make modules-all or make every-module  - all the modules 
260 263
 
261 264
 * Compile all:
262 265
 	make all
... ...
@@ -480,8 +483,8 @@ Documentation:
480 483
   module directory).
481 484
 	make man
482 485
 
483
-  Generates README file for modules_k/foo.
484
-	make modules=modules_k/foo modules-readme
486
+  Generates README file for modules/foo.
487
+	make modules=modules/foo modules-readme
485 488
 
486 489
 Install:
487 490
 --------
... ...
@@ -680,10 +683,10 @@ D) SIP Server with Persistent Data Storage
680 683
 
681 684
 3.2) create MySQL tables for Kamailio flavour
682 685
 	- if you have a previously installed Kamailio on your system, use
683
-    	/usr/sbin/kamdbctl reinstall 
686
+    	/usr/local/sbin/kamdbctl reinstall 
684 687
 	  to convert your Kamailio database into new structures
685 688
 	- otherwise, if this is your very first installation, use
686
-    	/usr/sbin/kamdbctl create
689
+    	/usr/local/sbin/kamdbctl create
687 690
 	  to create Kamailio database structures
688 691
    (you will be prompted for password of MySql "root" user)
689 692
 
... ...
@@ -235,7 +235,7 @@ module_group_kunixodbc=db_unixodbc
235 235
 module_group_kxml=xmlrpc mi_xmlrpc xmlops
236 236
 
237 237
 # K perl module
238
-module_group_kperl=perl perlvdb
238
+module_group_kperl=app_perl db_perlvdb
239 239
 
240 240
 # K snmpstats module
241 241
 module_group_ksnmpstats=snmpstats
... ...
@@ -299,8 +299,8 @@ module_group_kmono=app_mono
299 299
 
300 300
 # For IMS
301 301
 # kamailio modules
302
-module_group_kims=auth_ims cdp cdp_avp dialog2 ims_qos isc icscf ipsec\
303
-                        registrar_pcscf registrar_scscf usrloc_pcscf usrloc_scscf
302
+module_group_kims=ims_auth cdp cdp_avp dialog_ng ims_qos ims_isc ims_icscf\
303
+                        ims_registrar_pcscf ims_registrar_scscf ims_usrloc_pcscf ims_usrloc_scscf
304 304
 
305 305
 # if not set on the cmd. line, env or in the modules.lst (cfg_group_include)
306 306
 # exclude the below modules.
... ...
@@ -318,7 +318,7 @@ else
318 318
 							unixsock dbg print_lib auth_identity db2_ldap ldap \
319 319
 							db_berkeley db_mysql db_postgres db_oracle \
320 320
 							db_sqlite db_unixodbc db_cassandra memcached mi_xmlrpc \
321
-							perl perlvdb purple \
321
+							app_perl db_perlvdb purple \
322 322
 							snmpstats xmpp cdp \
323 323
 							carrierroute peering \
324 324
 							dialplan lcr utils presence presence_mwi \
... ...
@@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR)
162 162
 VERSION = 4
163 163
 PATCHLEVEL = 0
164 164
 SUBLEVEL =  0
165
-EXTRAVERSION = -pre0
165
+EXTRAVERSION = -pre1
166 166
 
167 167
 # memory manager switcher
168 168
 # 0 - f_malloc (fast malloc)
... ...
@@ -1,11 +1,12 @@
1 1
 $Id$
2 2
 
3 3
 
4
-                 SIP Router (sip-router)
5
-                http://www.sip-router.org/
4
+                Welcome to Kamailio v4.0!
5
+
6
+                http://www.kamailio.org/
6 7
                 ==========================
7 8
 
8
-I.   About SIP Router (sip-router)
9
+I.   About Kamailio
9 10
 II.  Feature List
10 11
 III. Getting started
11 12
 IV.  About the project
... ...
@@ -13,65 +14,76 @@ V.   Obtaining Help
13 14
 VI.  More Information
14 15
 
15 16
 
16
-SIP Router (sip-router) is an industrial-strength, free VoIP server based 
17
-on the Session Initiation Protocol (SIP RFC3261). 
18
-It is engineered to power IP telephony and presence infrastructures up to large 
19
-scale. The server keeps track of users, sets up VoIP sessions, relays instant 
17
+Kamailio is an industrial-strength, free server for realtime communication,
18
+based on the Session Initiation Protocol (SIP RFC3261). 
19
+
20
+It is engineered to power Realtime Communications such as IP telephony and presence 
21
+infrastructures up to large scale. With embedded support for WebSockets, HTTP,
22
+MSRP and XMLrpc as well as Json-rpc it's a modern server, up to date with current
23
+standards.
24
+
25
+Kamailio keeps track of users, sets up multimedia sessions, relays instant 
20 26
 messages and creates space for new plug-in applications. Its proven interoperability 
21 27
 guarantees seamless integration with components from other vendors, eliminating the 
22
-risk of a single-vendor trap. It has successfully participated in various 
28
+risk of a single-vendor trap. Kamailio has successfully participated in various 
23 29
 interoperability tests in which it worked with the products 
24 30
 of other leading SIP vendors.
25 31
 
26
-The SIP Router enables a flexible plug-in model for new applications: Third parties 
32
+The Kamailio software enables a flexible plug-in model for new applications: Third parties 
27 33
 can easily link their plug-ins with the server code and provide thereby advanced and
28
-customized services.  
34
+customized services. With a modern RPC interface, 3rd party application can integrate
35
+and interact with services provided by Kamailio.
29 36
 
30
-Its performance and robustness allows it to serve millions of users and accommodate needs
31
-of very large operators. With a $3000 dual-CPU, the SIP Express Router is able to power 
37
+Kamailio's performance and robustness allows it to serve millions of users and accommodate needs
38
+of very large operators. With a low-cost dual-CPU, the Kamailio server is able to power 
32 39
 IP telephony services in an area as large as the Bay Area during peak hours.
33 40
 
34
-The SIP Router is extremely configurable to allow the creation of various routing and 
41
+The Kamailio is extremely configurable to allow the creation of various routing and 
35 42
 admission policies as well as setting up new and customized services. Its configurability 
36 43
 allows it to serve many roles: network security barrier, presence server, application server, 
37
-or PSTN gateway guard (Session Border Controller) for example.
44
+IMS server or PSTN gateway guard (Session Border Controller) for example.
38 45
 
39 46
 
40 47
 II. Feature List
41 48
 ================
42 49
 
43
-See http://www.sip-router.org/ for an updated feature list.
50
+Please visit http://www.kamailio.org/ for the most up-to-date feature list.
44 51
 Note that as features easily are added as modules, changes can occur quickly.
45 52
 
46
-Most of SIP-router's features are implemented as plug-in modules. See 
53
+Most of Kamailio's features are implemented as plug-in modules. See 
47 54
 our web site for a current list.
48 55
 
49 56
 III. Getting started
50 57
 ====================
51 58
 
52
-The INSTALL document will guide you through the installation of sip-router. 
53
-SIP-router is composed of a core and additional modules. For each module
59
+The INSTALL document will guide you through the installation.
60
+
61
+Kamailio is composed of a core and additional modules. For each module
54 62
 there is a README with documentation on how to configure and use the 
55 63
 module. These are available in each modules source code directory as well
56
-as on the sip-router.org web site.
64
+as on the kamailio.org web site.
57 65
 
58 66
 We recommend that you continue with reading README-MODULES and then the
59 67
 document named INSTALL.
60 68
 
61
-IV. About sip-router.org
69
+IV. About kamailio.org
62 70
 ========================
63 71
 
64
-The SIP Router project was started during the fall of 2008 by developers from
65
-the OpenSER project, recently renamed to Kamailio.org and SIP Express Router (SER)
66
-from iptel.org. SIP Router is the result of a merge of the code base and years
67
-of experience from both developer teams.
72
+The Kamailio project has roots in a line of projects starting with SIP Express
73
+Router, then OpenSER and now Kamailio. A merge project was started during the fall
74
+of 2008 by developers from the OpenSER project, recently renamed to Kamailio.org
75
+and SIP Express Router (SER) from iptel.org. 
76
+
77
+Kamailio is the result of a merge of the code base and years
78
+of experience from both developer teams. In release 4.0, during the spring of 2013, the
79
+merger of the products was completed and a unified product was released.
68 80
 
69
-See http://www.sip-router.org/ for the story of SER, OpenSER/Kamailio and sip-router.org.
81
+See http://www.sip-router.org/ for the story of SER, OpenSER/Kamailio and kamailio.org.
70 82
 
71 83
 V. Obtaining Help
72 84
 =================
73 85
 
74
-We offer best-effort free support for sip-router. "best-effort" means 
86
+We offer best-effort free support for Kamailio. "best-effort" means 
75 87
 that we try to solve your problems via email as soon as we can, 
76 88
 subject to available manpower. 
77 89
 
... ...
@@ -85,11 +97,11 @@ VI. More Information
85 97
 ====================
86 98
 
87 99
 Most up-to-date information is always available at our website,
88
-                 http://www.sip-router.org/
100
+                 http://www.kamailio.org/
89 101
 
90 102
 Particularly, it includes:
91 103
 - administrator's guide
92
-- configuration cookbook
104
+- configuration cookbooks (core, pseudovariables and transformations)
93 105
 - module documentation
94 106
 - installation guidelines (INSTALL)
95 107
 - download links
... ...
@@ -3,23 +3,14 @@
3 3
 SIP-ROUTER modules
4 4
 ==================
5 5
 
6
-This is the first release of the combined project. In order to be able to support
7
-an upgrade path for both Kamailio/OpenSER and SER current users, we have been forced to
8
-provide some modules in two versions, which means that we have three set of modules:
6
+This is the second major release of the merged SIP Server - Kamailio and SER. 
7
+In the previous release some modules where provided in two versions, in Kamailio
8
+and SER flavours. These are now merged. In some cases, the functionality has 
9
+changed. You can still do the same operation, but how you do it may be different.
9 10
 
10
- - modules: 	the SIP router modules
11
- - modules_k: 	Kamailio modules
12
- - modules_s: 	SER modules
13
-
14
-All modules are compatible with the core, so regardless if you are a new user or 
15
-an existing, you are free to make a choice between the three sets as well as
16
-mix and match between them.
17
-
18
-Note that if you are currently using one product, you want to select the module
19
-that exists in the K/S directories first to get a smooth upgrade path.
20
-
21
-As sip-router development progress, we will move as many modules as possible
22
-into the core and only keep k/s modules for backwards compatibility when required.
11
+Modules are in the "modules" directory.
12
+In previous releases there was a "modules_k" and "modules_s" directory, but in
13
+this release these directories are empty.
23 14
 
24 15
 What is a module?
25 16
 =================
... ...
@@ -27,114 +18,148 @@ A module consists of a lot of functions that enhance the core. Some of the modul
27 18
 depends on other modules. It's all properly documented in the README that belongs
28 19
 to each module (available as web pages on the sip-router.org web site).
29 20
 
30
-A module providers up to three different APIs:
21
+A module providers up to five different APIs:
31 22
 
32 23
 - Enhancements to the core SIP-router routing script (functions)
33
-- Commands for the management interface (MI)
24
+- Commands for the management interface (MI and RPC)
34 25
 - Development interface for other modules
26
+- Pseudo-variables
27
+- Selects and config framework variables
35 28
 
36 29
 A single module may provide a selection of this, maybe only one of them.
37 30
 
38
-Why do we have two modules with the same name?
39
-==============================================
40
-Some modules exists both in modules_k and modules_s - like xlog. If you are
41
-upgrading from Kamailio, we recommend using the one in modules_k for backwards
42
-compatibility, if you are using SER then select the one in modules_s.
43
-In the future the development team will try to integrate modules that are
44
-split like this into one integrated module.
45
-
46
-Core modules
47
-auth_identity		SIP Identity support (RFC 4474)
48
-auth_radius		Radius authentication
49
-avpops			Attribute-value pair operations ("variables")
50
-carrierroute		A telephony routing module
51
-cfg_db			Database driver for configuration API
52
-cfg_rpc
53
-ctl
54
-db_berkeley		Database :: Berkeley DB (Oracle)
55
-db_flatstore		Database :: Flatstore
56
-db_mysql		Database :: Mysql
57
-db_postgres		Database :: PostgreSQL
58
-dialplan		Dialplan management
59
-enum			Enum support
60
-iptrtpproxy		NAT traversal :: Kernel based RTP proxy
61
-lcr			Least cost routing
62
-mediaproxy		Nat traversal :: Mediaproxy (AG projects)
63
-mi_rpc			Management Interface :: XML RPC support
64
-misc_radius		Various Radius functions
65
-pdb			Number portabilityusing external server
66
-peering			SIP peering between service providers
67
-tls			SSL/TLS support
68
-tm			SIP transaction support (stateful proxy)
69
-topoh			Topology hinding
70
-utils			Various utilities (http query, xcap status)
71
-xmlrpc
72
-
73
-Kamailio modules
31
+Kamailio Modules
74 32
 ----------------
75 33
 acc			Accounting
34
+acc_radius		Accounting with RADIUS backend
76 35
 alias_db		Alias management in database modules
36
+app_lua			Lang :: Execute embedded LUA scripts
37
+app_mono		Lang :: Execute embedded MONO scripts (like C#, Java, javascript)
38
+app_perl		Lang :: Embedded perl script support
39
+app_python		Lang :: Execute embedded Python scripts
40
+async			Asynchronus SIP request handling functions
77 41
 auth			MD5 digest authentication support
78 42
 auth_db			Authentication using a database module
79 43
 auth_diameter		Authentication based on Diameter
44
+auth_identity		SIP Identity support (RFC 4474)
45
+auth_radius		Radius authentication
46
+acp			Collection of functions for handling AVP's (from SER)
47
+avpops			Attribute-value pair operations ("variables")
80 48
 benchmark		Development benchmark module
49
+blst			Blacklisting API for configuration scripts
81 50
 call_control		Call timeouts and management (depends on Dialog module)
51
+carrierroute		A telephony routing module
52
+cdp			C Diameter Peer - core communication engine
53
+cdp_avp			C Diameter Peer - application extensions
54
+cfg_db			Database driver for configuration API
55
+cfg_rpc			Update core and module parameters from RPC
82 56
 cfgutils		Various configuration utilities
57
+corex			Core extensions
58
+counters		Internal counter API for configuration
83 59
 cpl-c			Implementation of SIP Call Processing Language (RFC 3880)
60
+ctl			Control connector for RPC interface (fifo, unixsock, tcp, udp)
61
+db_berkeley		Database :: Berkeley DB (Oracle)
62
+db_cluster		Generic database connectors clustering and failover
63
+db_cassandra		Database :: Cassandra database server connector
64
+db_flatstore		Database :: Flatstore
65
+db_mysql		Database :: Mysql
84 66
 db_oracle		Database :: Oracle support
67
+db_perlvdb		Database :: Use perl database functions
68
+db_postgres		Database :: PostgreSQL
85 69
 db_text			Database :: Text support
86 70
 db_unixodbc		Database :: Unix ODBC support
71
+db2_ldap		Database connector to LDAP using the DB2 API
72
+db2_ops			Database operations for DB API v2
73
+debugger		Interactive configuration processing debugger
87 74
 dialog			Dialog ("call") state module
75
+dialplan		Dialplan management
76
+dialog_ng		Dialog tracking module - next generation
88 77
 dispatcher		Load balancing and failover
89 78
 diversion		Call redirect support (SIP Diversion: header)
79
+dmq			Devel :: Distributed message queue system using SIP (early development)
90 80
 domain			Proxy :: Multiple domain support using databases
91 81
 domainpolicy		Proxy :: Obsolete module - This module is no longer maintained
92 82
 drouting		Proxy :: Dynamic routing
83
+enum			Enum support
93 84
 exec			External exec module
85
+geoip			GeoIP API to configuration file
94 86
 group			Utils :: Group membership checking
95 87
 h350			LDAP/ITU H.350 multimedia schema support
96 88
 htable			Utils :: Hash table support
97 89
 imc			IM :: Instant messaging conference
90
+ims_auth		IMS authentication module
91
+ims_icscf		IMS ICSCF component module
92
+ims_isc			IMS ISC component module
93
+ims_qos			IMS Diameter Rx interface
94
+ims_registrar_pcscf	IMS PCSCF registrar module
95
+ims_registrar_scscf	IMS SCSCF registrar module
96
+ipops			IP and DNS related operations
97
+iptrtpproxy		NAT traversal :: Kernel based RTP proxy
98 98
 jabber			IM :: Jabber gateway
99
+json			Access to JSON document attributes
100
+jsonrpc-c		JSON-RPC client over netstrings protocol
99 101
 kex			Proxy :: Kamailio core functions (backwards compatibility)
102
+lcr			Least cost routing
100 103
 ldap			LDAP Directory access
104
+malloc_test		Functions for stress-testing memory manager (from SER)
105
+mangler			SIP message mangling functions (from SER)
106
+matrix			Matrix operations
101 107
 maxfwd			SIP loop detection prevention (max-forwards header - "ttl")
108
+mediaproxy		Nat traversal :: Mediaproxy (AG projects)
102 109
 memcached		Utils :: In-memory caching support (memcached)
103 110
 mi_datagram		Management interface :: UDP
104 111
 mi_fifo			Management Interface :: Unix FIFO
112
+mi_rpc			Management Interface :: RPC support
105 113
 mi_xmlrpc		Management Interface :: XML-rpc
114
+misc_radius		Various Radius functions
106 115
 msilo			Text message storage
116
+msrp			Embedded MSRP relay (RFC 4975 and RFC 4976)
117
+mqueue			Message queue system for configuration file
107 118
 nat_traversal		NAT :: NAT traversal module
108 119
 nathelper		NAT :: NAT traversal module :: RTPproxy (SIPPY software)
120
+ndb_redis		Connector to REDIS NoSQL Database engine
109 121
 osp			Open Settlement Protocol support
122
+outbound		SIP Outbound Implementation
123
+p_usrloc		Partitioned and distributed user location services
110 124
 path			Path: header support
125
+pdb			Number portability using external server
111 126
 pdt			Proxy :: Routing based on numeric prefix
112
-perl			Perl-based module interface
113
-perlvdb			Database :: Use perl database functions
127
+peering			SIP peering between service providers
114 128
 permissions		Security :: TCP-wrapper-like ACL functions
115 129
 pike			Security :: DOS-attack prevention
130
+pipelimit		Traffic shaping policies
131
+prefix_route		Execute config file route blocks based on prefix
116 132
 presence		Presence :: Core presence module
133
+presence_conference	Presence :: Conference events handling
117 134
 presence_dialoginfo	Presence :: Dialog info
118 135
 presence_mwi		Presence :: Message waiting indication
136
+presence_profile	Presence :: User profile extensions (RFC 6080)
137
+presence_reginfo	Presence :: Registration info (RFC 3680)
119 138
 presence_xml		Presence :: XML handler
139
+print			DEVEL :: Basic sample of a module
140
+print_lib		DEVEL :: Basic sample of a module with dependency on other modules
120 141
 pua			Presence :: Common module
121 142
 pua_bla			Presence :: BLA
122 143
 pua_dialoginfo		Presence :: Dialog Info support
123 144
 pua_mi			Presence :: Management interface
145
+pua_reginfo		Presence :: Registration information (RFC 3680)
124 146
 pua_usrloc		Presence :: USRLOC integration
125 147
 pua_xmpp		Presence :: XMPP/Jabber gateway
126 148
 purple			Presence :: Libpurple support
127 149
 pv			Pseudo-variable implementation
128 150
 qos			Dialogs :: SDP management 
129
-ratelimit		Security :: Rate limit
151
+ratelimit		Traffic shaping module
130 152
 regex			Regular expression support
131 153
 registrar		Registrar/location server support
132 154
 rls			Presence :: Resource list server
133 155
 rr			Proxy :: Record routing
134 156
 rtimer			Utils :: Timer based routing script processing
157
+rtpproxy		NAT :: Nat traversal module for RTPproxy control
135 158
 sanity			Syntax checking for incoming SIP requests
159
+sca			PRESENCE :: Shared call appearances
160
+sdpops			SDP operations
136 161
 seas			Application server interface
162
+sipcapture		SIP Capture Server module (used in the Homer project)
137 163
 siptrace		Store SIP messages in database
138 164
 siputils		Various utilities for SIP call handling
139 165
 sl			Proxy :: Stateless handling of SIP messages
... ...
@@ -145,71 +170,32 @@ sqlops			SQL operations
145 170
 sst			SIP Session Timers implementation
146 171
 statistics		Script statistics support
147 172
 textops			Text operations
173
+textopsx		Extra Text operations
174
+timer			Execute routing blocks on core timers (From SER)
175
+tls			SSL/TLS support
176
+tm			Proxy :: SIP transaction support (stateful)
148 177
 tmx			Proxy :: Kamailio transaction extensions (TM module)
178
+topoh			Topology hinding
149 179
 uac			UAC functions (From: mangling and UAC auth)
150 180
 uac_redirect		UAC redirection support
181
+uid_auth_db		Authentication module using unique IDs (from SER)
182
+uid_avp_db		AVP Database operations using unique IDs (from SER)
183
+uid_domain		Domain management using unique IDs (from SER)
184
+uid_gflags		Global attributes and flags using Unique IDs (from SER)
185
+uid_uri_db		Database URI operations using unique IDs (from SER)
151 186
 uri_db			URI operation with database support
152 187
 userblacklist		User-specific blacklists
153 188
 usrloc			Proxy :: Location server
189
+utils			Various utilities (http query, xcap status)
190
+websocket		HTTP :: Websocket transport layer for proxy
154 191
 xcap_client		Presence :: XCAP support
192
+xcap_server		Presence :: XCAP server implementation
193
+xhttp			HTTP :: The server
194
+xhttp_pi		HTTP :: Provisioning interface for Kamailio
195
+xhttp_rpc		HTTP :: RPC Command support
155 196
 xlog			Utils :: Extended logging support
197
+xmlops			XML operations using XPath
198
+xmlrpc			HTTP :: XMLrpc support
156 199
 xmpp			Presence/IM :: XMPP/jabber gateway
200
+xprint			Functions for printing messages with specifiers (from SER)
157 201
 
158
-SER modules
159
-acc_db			Authentication :: acc module is used to report on transactions to database
160
-acc_radius		Authentication :: acc module is used to report on transactions to RADIUS.
161
-acc_syslog		Authentication :: acc module is used to report on transactions to syslog
162
-auth			Authentication backend (needs additional modules)
163
-auth_db			Database authentication
164
-avp			functions used to manipulate the contents of Attribute-Value pairs
165
-avp_db			Attribute-value pairs in database
166
-bdb			Database :: Berkeley DB (Oracle)
167
-blst			Blacklist management
168
-cpl-c			CPL support in SIP-router
169
-db_ops			Database :: SQL operations from configurtion script
170
-dbg			Debugging support
171
-dbtext			Database :: Text
172
-dialog
173
-dispatcher		Load balancing ::  a dispatcher for destination addresses
174
-diversion		Proxy :: Call redirection support (Diversion: header)
175
-domain			Proxy :: Multiple domain support
176
-eval			implements expression evaluation in route script
177
-exec			Proxy :: External script support (modify route set)
178
-fifo			Obsolete :: This module is replaced by the modules/ctl module
179
-gflags			Proxy :: Global flags
180
-jabber			IM :: Jabber gateway
181
-ldap			LDAP directory server support
182
-mangler			SDP mangling
183
-maxfwd			Proxy :: Loop prevention (max-forwards header)
184
-msilo			Offline message storage
185
-nathelper		NAT traversal :: RTP proxy (SIPPY software)
186
-options			Proxy :: Support for SIP OPTION request
187
-oracle			Database :: Oracle
188
-osp			Open Settlement Protocol
189
-pa			Presence :: server
190
-pdt			Proxy :: Simple routing on number prefixes
191
-permissions		Security :: ACL support like TCP wrappers
192
-pike			Security :: Rate limit control
193
-prefix_route		Proxy :: Routing based on a set of prefixes from the database
194
-presence_b2b		Presence :: Back2back UA
195
-print			Example module for developers
196
-print_lib		Example module for developers
197
-ratelimit		Security :: Rate limit of SIP requests
198
-registrar		Registrar (for REGISTER requests)
199
-rls			Resource list server (for presence)
200
-rr			Proxy :: Record routing logic
201
-sanity			Implement several sanity checks on incoming requests
202
-sl			Proxy :: Stateless replies
203
-sms			SMS gateway
204
-speeddial		Proxy :: Speed dialing for users
205
-textops			Text operations (search, replace)
206
-timer			triggering specific route block on timer
207
-tls			TLS module * DEPRECATED * Use the modules/tls module instead
208
-uac			User agent client
209
-unixsock		Obsolete :: This module is replaced by the modules/ctl module
210
-uri			URI checks
211
-uri_db			URI checks with database support
212
-usrloc			Location server
213
-xcap			Presence :: XCAP integration
214
-xlog			Extended logging support
... ...
@@ -1100,7 +1100,7 @@ IMPORTFILE      "import_file"
1100 1100
 <PVARID>{ID}|'\.'			{yymore(); }
1101 1101
 <PVARID>{LPAREN}			{	state = PVAR_P_S; BEGIN(PVAR_P);
1102 1102
 								p_nest=1; yymore(); }
1103
-<PVARID>.					{	yyless(yyleng-1);
1103
+<PVARID>{CR}|{EAT_ABLE}|.	{	yyless(yyleng-1);
1104 1104
 								count();
1105 1105
 								addstr(&s_buf, yytext, yyleng);
1106 1106
 								yylval.strval=s_buf.s;
... ...
@@ -754,7 +754,8 @@ int update_sock_struct_from_via( union sockaddr_union* to,
754 754
 	he=sip_resolvehost(name, &port, &proto);
755 755
 	
756 756
 	if (he==0){
757
-		LOG(L_NOTICE, "ERROR:forward_reply:resolve_host(%.*s) failure\n",
757
+		LOG(L_NOTICE,
758
+				"update_sock_struct_from_via:resolve_host(%.*s) failure\n",
758 759
 				name->len, name->s);
759 760
 		return -1;
760 761
 	}
... ...
@@ -765,8 +766,9 @@ int update_sock_struct_from_via( union sockaddr_union* to,
765 766
 
766 767
 
767 768
 
768
-/* removes first via & sends msg to the second */
769
-int forward_reply(struct sip_msg* msg)
769
+/* removes first via & sends msg to the second
770
+ * - mode param controls if modules sip response callbacks are executed */
771
+static int do_forward_reply(struct sip_msg* msg, int mode)
770 772
 {
771 773
 	char* new_buf;
772 774
 	struct dest_info dst;
... ...
@@ -792,8 +794,10 @@ int forward_reply(struct sip_msg* msg)
792 794
 	}
793 795
 	
794 796
 	/* check modules response_f functions */
795
-	for (r=0; r<mod_response_cbk_no; r++)
796
-		if (mod_response_cbks[r](msg)==0) goto skip;
797
+	if(likely(mode==0)) {
798
+		for (r=0; r<mod_response_cbk_no; r++)
799
+			if (mod_response_cbks[r](msg)==0) goto skip;
800
+	}
797 801
 	/* we have to forward the reply stateless, so we need second via -bogdan*/
798 802
 	if (parse_headers( msg, HDR_VIA2_F, 0 )==-1 
799 803
 		|| (msg->via2==0) || (msg->via2->error!=PARSE_OK))
... ...
@@ -872,6 +876,18 @@ error:
872 876
 	return -1;
873 877
 }
874 878
 
879
+/* removes first via & sends msg to the second */
880
+int forward_reply(struct sip_msg* msg)
881
+{
882
+	return do_forward_reply(msg, 0);
883
+}
884
+
885
+/* removes first via & sends msg to the second - no module callbacks */
886
+int forward_reply_nocb(struct sip_msg* msg)
887
+{
888
+	return do_forward_reply(msg, 1);
889
+}
890
+
875 891
 static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg)
876 892
 {
877 893
 	if (msg->force_send_socket != 0) {
... ...
@@ -105,6 +105,7 @@ int update_sock_struct_from_via( union sockaddr_union* to,
105 105
 							((msg)->via1->port)?(msg)->via1->port: SIP_PORT )
106 106
 
107 107
 int forward_reply( struct sip_msg* msg);
108
+int forward_reply_nocb( struct sip_msg* msg);
108 109
 
109 110
 int is_check_self_func_list_set(void);
110 111
 
... ...
@@ -9,9 +9,19 @@ MAJOR_VER=0
9 9
 MINOR_VER=1
10 10
 BUGFIX_VER=0
11 11
 DEFS+=-DSER
12
-libxml2_includes=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \
13
-					-I$(LOCALBASE)/include
14
-libxml2_libs=-L$(LOCALBASE)/lib -lxml2
12
+
13
+ifeq ($(CROSS_COMPILE),)
14
+XML2CFG=$(shell which xml2-config)
15
+endif
16
+
17
+ifneq ($(XML2CFG),)
18
+	libxml2_includes = $(shell $(XML2CFG) --cflags)
19
+	libxml2_libs = $(shell $(XML2CFG) --libs)
20
+else
21
+	libxml2_includes = -I$(LOCALBASE)/include/libxml2 -I$(LOCALBASE)/include
22
+	libxml2_libs = -L$(LOCALBASE)/lib -lxml2
23
+endif
24
+
15 25
 INCLUDES= -I$(CURDIR)/.. -I$(CURDIR)/../.. $(libxml2_includes) 
16 26
 LIBS=$(libxml2_libs)
17 27
 #SERLIBPATH=..
... ...
@@ -216,7 +216,7 @@ create function todomain (pdid varchar(64)) returns varchar(128)
216 216
 READS SQL DATA
217 217
 begin
218 218
     declare tdomain varchar(128) default NULL;
219
-	select domain into tdomain from domain where did=pdid and 
219
+	select domain into tdomain from uid_domain where did=pdid and 
220 220
         canonical(flags) limit 1;
221 221
 	return tdomain;
222 222
 end
... ...
@@ -238,7 +238,7 @@ create function todid (pdomain varchar(128)) returns varchar(64)
238 238
 READS SQL DATA
239 239
 begin
240 240
     declare tdid varchar(64) default NULL;
241
-    select did into tdid from domain where domain=pdomain and 
241
+    select did into tdid from uid_domain where domain=pdomain and 
242 242
         active(flags) limit 1;
243 243
 	return tdid;
244 244
 end
... ...
@@ -124,7 +124,7 @@ begin
124 124
         set tdid = todid(substr(puri FROM i + 1));
125 125
 	    set puri = left(puri, i - 1);
126 126
 	end if;
127
-	select uid into tuid from uri where scheme=tscheme and
127
+	select uid into tuid from uid_uri where scheme=tscheme and
128 128
         username=puri and did=tdid and active(flags);
129 129
 	return tuid;
130 130
 end
131 131
similarity index 100%
132 132
rename from modules_k/acc/Makefile
133 133
rename to modules/acc/Makefile
134 134
similarity index 100%
135 135
rename from modules_k/acc/README
136 136
rename to modules/acc/README
137 137
similarity index 100%
138 138
rename from modules_k/acc/acc.c
139 139
rename to modules/acc/acc.c
140 140
similarity index 100%
141 141
rename from modules_k/acc/acc.h
142 142
rename to modules/acc/acc.h
143 143
similarity index 100%
144 144
rename from modules_k/acc/acc_api.h
145 145
rename to modules/acc/acc_api.h
146 146
similarity index 100%
147 147
rename from modules_k/acc/acc_cdr.c
148 148
rename to modules/acc/acc_cdr.c
149 149
similarity index 100%
150 150
rename from modules_k/acc/acc_cdr.h
151 151
rename to modules/acc/acc_cdr.h
152 152
similarity index 100%
153 153
rename from modules_k/acc/acc_extra.c
154 154
rename to modules/acc/acc_extra.c
155 155
similarity index 100%
156 156
rename from modules_k/acc/acc_extra.h
157 157
rename to modules/acc/acc_extra.h
158 158
similarity index 100%
159 159
rename from modules_k/acc/acc_logic.c
160 160
rename to modules/acc/acc_logic.c
161 161
similarity index 100%
162 162
rename from modules_k/acc/acc_logic.h
163 163
rename to modules/acc/acc_logic.h
164 164
similarity index 100%
165 165
rename from modules_k/acc/acc_mod.c
166 166
rename to modules/acc/acc_mod.c
167 167
similarity index 100%
168 168
rename from modules_k/acc/acc_mod.h
169 169
rename to modules/acc/acc_mod.h
170 170
similarity index 100%
171 171
rename from modules_k/acc/diam_avp.c
172 172
rename to modules/acc/diam_avp.c
173 173
similarity index 100%
174 174
rename from modules_k/acc/diam_dict.h
175 175
rename to modules/acc/diam_dict.h
176 176
similarity index 100%
177 177
rename from modules_k/acc/diam_message.c
178 178
rename to modules/acc/diam_message.c
179 179
similarity index 100%
180 180
rename from modules_k/acc/diam_message.h
181 181
rename to modules/acc/diam_message.h
182 182
similarity index 100%
183 183
rename from modules_k/acc/diam_tcp.c
184 184
rename to modules/acc/diam_tcp.c
185 185
similarity index 100%
186 186
rename from modules_k/acc/diam_tcp.h
187 187
rename to modules/acc/diam_tcp.h
188 188
similarity index 100%
189 189
rename from modules_k/acc/doc/Makefile
190 190
rename to modules/acc/doc/Makefile
191 191
similarity index 100%
192 192
rename from modules_k/acc/doc/acc.xml
193 193
rename to modules/acc/doc/acc.xml
194 194
similarity index 100%
195 195
rename from modules_k/acc/doc/acc_admin.xml
196 196
rename to modules/acc/doc/acc_admin.xml
197 197
similarity index 100%
198 198
rename from modules_k/acc/doc/acc_faq.xml
199 199
rename to modules/acc/doc/acc_faq.xml
200 200
similarity index 100%
201 201
rename from modules_k/acc/etc/radiusclient.conf
202 202
rename to modules/acc/etc/radiusclient.conf
203 203
similarity index 100%
204 204
rename from modules_k/acc/etc/servers
205 205
rename to modules/acc/etc/servers
206 206
similarity index 100%
207 207
rename from modules_k/acc_radius/Makefile
208 208
rename to modules/acc_radius/Makefile
209 209
similarity index 100%
210 210
rename from modules_k/acc_radius/README
211 211
rename to modules/acc_radius/README
212 212
similarity index 99%
213 213
rename from modules_k/acc_radius/acc_radius_mod.c
214 214
rename to modules/acc_radius/acc_radius_mod.c
... ...
@@ -47,7 +47,7 @@
47 47
 #include "../../mem/mem.h"
48 48
 #include "../../parser/parse_to.h"
49 49
 #include "../../lib/kcore/radius.h"
50
-#include "../../modules_k/acc/acc_api.h"
50
+#include "../../modules/acc/acc_api.h"
51 51
 #include "acc_radius_mod.h"
52 52
 
53 53
 MODULE_VERSION
54 54
similarity index 100%
55 55
rename from modules_k/acc_radius/acc_radius_mod.h
56 56
rename to modules/acc_radius/acc_radius_mod.h
57 57
similarity index 100%
58 58
rename from modules_k/acc_radius/doc/Makefile
59 59
rename to modules/acc_radius/doc/Makefile
60 60
similarity index 100%
61 61
rename from modules_k/acc_radius/doc/acc_radius.xml
62 62
rename to modules/acc_radius/doc/acc_radius.xml
63 63
similarity index 100%
64 64
rename from modules_k/acc_radius/doc/acc_radius_admin.xml
65 65
rename to modules/acc_radius/doc/acc_radius_admin.xml
66 66
similarity index 100%
67 67
rename from modules_k/alias_db/Makefile
68 68
rename to modules/alias_db/Makefile
69 69
similarity index 100%
70 70
rename from modules_k/alias_db/README
71 71
rename to modules/alias_db/README
72 72
similarity index 100%
73 73
rename from modules_k/alias_db/alias_db.c
74 74
rename to modules/alias_db/alias_db.c
75 75
similarity index 100%
76 76
rename from modules_k/alias_db/alias_db.h
77 77
rename to modules/alias_db/alias_db.h
78 78
similarity index 100%
79 79
rename from modules_k/alias_db/alookup.c
80 80
rename to modules/alias_db/alookup.c
81 81
similarity index 100%
82 82
rename from modules_k/alias_db/alookup.h
83 83
rename to modules/alias_db/alookup.h
84 84
similarity index 100%
85 85
rename from modules_k/alias_db/api.h
86 86
rename to modules/alias_db/api.h
87 87
similarity index 100%
88 88
rename from modules_k/alias_db/doc/Makefile
89 89
rename to modules/alias_db/doc/Makefile
90 90
similarity index 100%
91 91
rename from modules_k/alias_db/doc/alias_db.xml
92 92
rename to modules/alias_db/doc/alias_db.xml
93 93
similarity index 100%
94 94
rename from modules_k/alias_db/doc/alias_db_admin.xml
95 95
rename to modules/alias_db/doc/alias_db_admin.xml
... ...
@@ -33,27 +33,27 @@
33 33
 
34 34
 #include "../../modules/sl/sl.h"
35 35
 #include "../../modules/tm/tm_load.h"
36
-#include "../../modules_k/sqlops/sql_api.h"
37
-#include "../../modules_k/rr/api.h"
36
+#include "../../modules/sqlops/sql_api.h"
37
+#include "../../modules/rr/api.h"
38 38
 #include "../../modules/auth/api.h"
39
-#include "../../modules_k/auth_db/api.h"
40
-#include "../../modules_k/maxfwd/api.h"
41
-#include "../../modules_k/registrar/api.h"
42
-#include "../../modules_k/dispatcher/api.h"
39
+#include "../../modules/auth_db/api.h"
40
+#include "../../modules/maxfwd/api.h"
41
+#include "../../modules/registrar/api.h"
42
+#include "../../modules/dispatcher/api.h"
43 43
 #include "../../modules/xhttp/api.h"
44 44
 #include "../../modules/sdpops/api.h"
45
-#include "../../modules_k/presence/bind_presence.h"
46
-#include "../../modules_k/presence_xml/api.h"
47
-#include "../../modules_k/textops/api.h"
48
-#include "../../modules_k/pua_usrloc/api.h"
49
-#include "../../modules_k/siputils/siputils.h"
50
-#include "../../modules_k/rls/api.h"
51
-#include "../../modules_k/alias_db/api.h"
52
-#include "../../modules_k/msilo/api.h"
53
-#include "../../modules_k/uac/api.h"
45
+#include "../../modules/presence/bind_presence.h"
46
+#include "../../modules/presence_xml/api.h"
47
+#include "../../modules/textops/api.h"
48
+#include "../../modules/pua_usrloc/api.h"
49
+#include "../../modules/siputils/siputils.h"
50
+#include "../../modules/rls/api.h"
51
+#include "../../modules/alias_db/api.h"
52
+#include "../../modules/msilo/api.h"
53
+#include "../../modules/uac/api.h"
54 54
 #include "../../modules/sanity/api.h"
55
-#include "../../modules_k/cfgutils/api.h"
56
-#include "../../modules_k/tmx/api.h"
55
+#include "../../modules/cfgutils/api.h"
56
+#include "../../modules/tmx/api.h"
57 57
 #include "../../modules/mqueue/api.h"
58 58
 
59 59
 #include "app_lua_api.h"
60 60
new file mode 100644
... ...
@@ -0,0 +1,76 @@
1
+# $Id$
2
+#
3
+# perl module makefile
4
+#
5
+# 
6
+# WARNING: do not run this directly, it should be run by the master Makefile
7
+
8
+include ../../Makefile.defs
9
+auto_gen=kamailioxs.c
10
+NAME=app_perl.so
11
+LIBS=
12
+
13
+ifeq ($(PERLLDOPTS),)
14
+	LIBS+=`perl -MExtUtils::Embed -e ldopts`
15
+else
16
+	LIBS+=$(PERLLDOPTS)
17
+endif
18
+
19
+ifeq ($(PERLCCOPTS),)
20
+	PERLCCOPTS=$(shell perl -MExtUtils::Embed -e ccopts)
21
+endif
22
+DEFS+=$(PERLCCOPTS)
23
+
24
+
25
+DEFS+=-DKAMAILIO_MOD_INTERFACE
26
+
27
+SERLIBPATH=../../lib
28
+SER_LIBS+=$(SERLIBPATH)/kmi/kmi
29
+
30
+PODFILES=kamailioxs.xs `find lib/perl -name *.pm`
31
+
32
+ifeq ($(TYPEMAP),)
33
+	ifeq ($(PERLLIBPATH),)
34
+		PERLLIBPATH=`perl -MConfig -e 'print $$Config{installprivlib}'`
35
+	endif
36
+	TYPEMAP=$(PERLLIBPATH)/ExtUtils/typemap
37
+endif
38
+
39
+include ../../Makefile.modules
40
+
41
+perl.d: kamailioxs.o
42
+perl.o: perl.c kamailioxs.o
43
+
44
+kamailioxs.o: CFLAGS+=-Wno-unused
45
+
46
+kamailioxs.c: kamailioxs.xs typemap
47
+	xsubpp -typemap $(TYPEMAP) -typemap typemap kamailioxs.xs > kamailioxs.c
48
+
49
+.PHONY: perlpod
50
+perlpod: doc/app_perl_pod.xml
51
+
52
+doc/app_perl_pod.sgml: kamailioxs.xs
53
+	cat $(PODFILES) | pod2docbook --doctype=chapter --title='Kamailio Perl API' --no-header - doc/app_perl_pod.sgml
54
+
55
+install-perl-scripts:
56
+	echo "installing Perl Kamailio packages ..."
57
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl
58
+	$(INSTALL_CFG) lib/perl/*.pm $(modules_prefix)/$(lib_dir)/perl
59
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio
60
+	$(INSTALL_CFG) lib/perl/Kamailio/*.pm \
61
+		$(modules_prefix)/$(lib_dir)/perl/Kamailio
62
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/LDAPUtils
63
+	$(INSTALL_CFG) lib/perl/Kamailio/LDAPUtils/*.pm \
64
+		$(modules_prefix)/$(lib_dir)/perl/Kamailio/LDAPUtils
65
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/Utils
66
+	$(INSTALL_CFG) lib/perl/Kamailio/Utils/*.pm \
67
+		$(modules_prefix)/$(lib_dir)/perl/Kamailio/Utils
68
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB
69
+	$(INSTALL_CFG) lib/perl/Kamailio/VDB/*.pm \
70
+		$(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB
71
+	mkdir -p $(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB/Adapter
72
+	$(INSTALL_CFG) lib/perl/Kamailio/VDB/Adapter/*.pm \
73
+		$(modules_prefix)/$(lib_dir)/perl/Kamailio/VDB/Adapter
74
+
75
+install-scripts: install-perl-scripts
76
+
0 77
similarity index 84%
1 78
rename from modules_k/perl/README
2 79
rename to modules/app_perl/README
... ...
@@ -33,13 +33,13 @@ Bastian Friedrich
33 33
               6.1. perl_exec_simple(func, [param])
34 34
               6.2. perl_exec(func, [param])
35 35
 
36
-   2. OpenSER Perl API
36
+   2. Kamailio Perl API
37 37
 
38
-        1. OpenSER
38
+        1. Kamailio
39 39
 
40 40
               1.1. log(level,message)
41 41
 
42
-        2. OpenSER::Message
42
+        2. Kamailio::Message
43 43
 
44 44
               2.1. getType()
45 45
               2.2. getStatus()
... ...
@@ -62,7 +62,7 @@ Bastian Friedrich
62 62
               2.19. append_branch(branch,qval)
63 63
               2.20. getParsedRURI()
64 64
 
65
-        3. OpenSER::URI
65
+        3. Kamailio::URI
66 66
 
67 67
               3.1. user()
68 68
               3.2. host()
... ...
@@ -85,13 +85,13 @@ Bastian Friedrich
85 85
               3.19. lr_val()
86 86
               3.20. r2_val()
87 87
 
88
-        4. OpenSER::AVP
88
+        4. Kamailio::AVP
89 89
 
90 90
               4.1. add(name,val)
91 91
               4.2. get(name)
92 92
               4.3. destroy(name)
93 93
 
94
-        5. OpenSER::Utils::PhoneNumbers
94
+        5. Kamailio::Utils::PhoneNumbers
95 95
 
96 96
               5.1.
97 97
                       new(publicAccessPrefix,internationalPrefix,longDistanceP
... ...
@@ -100,7 +100,7 @@ Bastian Friedrich
100 100
               5.2. canonicalForm( number [, context] )
101 101
               5.3. dialNumber( number [, context] )
102 102
 
103
-        6. OpenSER::LDAPUtils::LDAPConf
103
+        6. Kamailio::LDAPUtils::LDAPConf
104 104
 
105 105
               6.1. Constructor new()
106 106
               6.2. Method base()
... ...
@@ -112,7 +112,7 @@ Bastian Friedrich
112 112
               6.8. Method binddn()
113 113
               6.9. Method bindpw()
114 114
 
115
-        7. OpenSER::LDAPUtils::LDAPConnection
115
+        7. Kamailio::LDAPUtils::LDAPConnection
116 116
 
117 117
               7.1. Constructor new( [config, [authenticated]] )
118 118
               7.2. Function/Method search( conf, filter, base,
... ...
@@ -121,52 +121,52 @@ Bastian Friedrich
121 121
                     7.2.1. Arguments:
122 122
                     7.2.2. Result:
123 123
 
124
-        8. OpenSER::VDB
125
-        9. OpenSER::Constants
126
-        10. OpenSER::VDB::Adapter::Speeddial
127
-        11. OpenSER::VDB::Adapter::Alias
124
+        8. Kamailio::VDB
125
+        9. Kamailio::Constants
126
+        10. Kamailio::VDB::Adapter::Speeddial
127
+        11. Kamailio::VDB::Adapter::Alias
128 128
 
129 129
               11.1. query(conds,retkeys,order)
130 130
 
131
-        12. OpenSER::VDB::Adapter::AccountingSIPtrace
132
-        13. OpenSER::VDB::Adapter::Describe
133
-        14. OpenSER::VDB::Adapter::Auth
134
-        15. OpenSER::VDB::ReqCond
131
+        12. Kamailio::VDB::Adapter::AccountingSIPtrace
132
+        13. Kamailio::VDB::Adapter::Describe
133
+        14. Kamailio::VDB::Adapter::Auth
134
+        15. Kamailio::VDB::ReqCond
135 135