Merge branch 'master' into websocket

Conflicts:
	Makefile
	pkg/kamailio/centos/6/kamailio-build.appl
	pkg/kamailio/centos/6/kamailio.appl
	pkg/kamailio/fedora/16/kamailio-build.appl
	pkg/kamailio/fedora/16/kamailio.appl
	pkg/kamailio/fedora/16/kamailio.spec
	pkg/kamailio/fedora/17/kamailio-build.appl
	pkg/kamailio/fedora/17/kamailio.appl

Makefile

@@ -306,18 +306,18 @@ else
 	exclude_modules?= 		cpl mangler postgres jabber mysql cpl-c \
 							auth_radius misc_radius avp_radius uri_radius \
 							acc_radius pa rls presence_b2b xcap xmlrpc\
-							osp tls oracle cassandra websocket \
+							osp tls oracle \
 							unixsock dbg print_lib auth_identity ldap \
 							db_berkeley db_mysql db_postgres db_oracle \
 							db_sqlite db_unixodbc db_cassandra memcached mi_xmlrpc \
 							perl perlvdb purple \
-							snmpstats xmpp \
+							snmpstats xmpp cdp \
 							carrierroute peering \
 							dialplan lcr utils presence presence_mwi \
 							presence_dialoginfo presence_xml pua pua_bla \
 							pua_dialoginfo pua_usrloc pua_xmpp \
 							regex xcap_client xcap_server presence_conference \
-							presence_reginfo pua_reginfo
+							presence_reginfo pua_reginfo websocket
 	#excluded because they depend on external *.h files
 	exclude_modules+= h350
 	# excluded because they do not compile (remove them only after they are

pkg/kamailio/centos/6/README

@@ -0,0 +1 @@
+../../fedora/16/README

pkg/kamailio/centos/6/kamailio-build.appl

@@ -22,7 +22,7 @@ packages:
   - libevent-devel		# kamailio-json
   - libpurple-devel		# kamailio-purple
   - libunistring-devel		# kamailio-websocket
-  - libxml2-devel		# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2-devel		# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - lua-devel			# kamailio-lua
   - make			# kamailio
   - mod_perl-devel		# kamailio-perl

pkg/kamailio/centos/6/kamailio.appl

@@ -18,7 +18,7 @@ packages:
   - libevent			# kamailio-json
   - libpurple			# kamailio-purple
   - libunistring		# kamailio-websocket
-  - libxml2			# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2			# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - mod_perl			# kamailio-perl
   - mysql-libs			# kamailio-mysql
   - net-snmp-libs		# kamailio-snmpstats

pkg/kamailio/fedora/16/README

@@ -0,0 +1,67 @@
+Building Kamailio RPMs for Enterprise Linux and Fedora
+------------------------------------------------------
+
+This is a simple process:
+1) Create a clean appliance using BoxGrinder (always worth doing as it makes
+   sure your build appliance contains only standard versions of packages and
+   has all updates applied).
+2) Start the appliance and log in.
+3) Prepare the appliance for RPM builds
+4) Either:
+   a) Checkout the version of Kamailio you want to build from GIT (instructions
+      available on the Kamailio wiki at http://www.kamailio.org/wiki) and
+      create a release tar file, or
+   b) Download a release tar file from http://www.kamailio.org/pub/kamailio and
+      extract the correct kamailio.spec file from it
+5) Run "rpmbuild" to create the RPMs
+
+If you don't have BoxGrinder installed (http://boxgrinder.org/) you can do so in
+Fedora using the command:
+
+   # [sudo] yum install rubygem-boxgrinder-build
+
+Note: The host operating system you install BoxGrinder on does not have to be
+      same operating system flavour, architecture, or version as the appliance
+      you are creating.  It is entirely sensible to use an x86_64 Fedora host to
+      build an i386 CentOS appliance and i386 CentOS Kamailio RPMs.
+
+Example: Building Kamailio 3.4.x (master) x86_64 binary RPMs from GIT for
+         Fedora 17.
+
+This example assumes:
+- You have Internet connectivity
+- You have BoxGrinder, and libvirtd (and any management software required for
+  it) installed locally.
+- You have obtained the kamailio-build.appl file from pkg/kamailio/fedora/17
+  (either by download from http://git.sip-router.org/ or from a local
+  checkout of the code)
+- Your host operating system is x86_64.
+
+If you want to build a different version of Kamailio, a different set of RPMs
+(different rpmbuild options), or install and run the appliance on a remote
+(or different type of virtual) machine you should only need to make small
+changes to the commands in this example.
+
+1) Create a clean Fedora 17 x86_64 appliance using BoxGrinder:
+   # mkdir appliance
+   # cd appliance
+   # [sudo] boxgrinder-build \
+       [path to]/pkg/kamailio/fedora/17/kamailio-build.appl -d libvirt \
+       --delivery_config connection_uri:qemu:///system,\
+       image_delivery_uri:/var/lib/libvirt/images,overwrite:true,\
+       domain_type:kvm
+2) Start the appliance and log in:
+   - I prefer to use virt-manager for this.  The default username and password
+     for the appliance is "root" and "kamailio" respectively.
+3) Prepare the appliance for RPM builds:
+   # mkdir -p rpmbuild/SOURCES
+4) Checkout Kamailio 3.4.x (master) and create a release tar file:
+   # git clone --depth 1 git://git.sip-router.org/sip-router kamailio
+   # cd kamailio
+    Note: if not building master you want to do a "git checkout" after this
+   # git archive --output ../rpmbuild/SOURCES/kamailio-3.4.0_src.tar.gz \
+       --prefix=kamailio-3.4.0/ master
+5) Run "rpmbuild" to create the binary RPMs:
+   # rpmbuild -bb pkg/kamailio/fedora/17/kamailio.spec
+
+Once the build is complete the RPMs will be in ~/rpmbuild/RPMS/x86_64.

pkg/kamailio/fedora/16/kamailio-build.appl

@@ -26,7 +26,7 @@ packages:
   - libevent-devel		# kamailio-json
   - libpurple-devel		# kamailio-purple
   - libunistring-devel		# kamailio-websocket
-  - libxml2-devel		# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2-devel		# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - lua-devel			# kamailio-lua
   - make			# kamailio
   - mod_perl-devel		# kamailio-perl

pkg/kamailio/fedora/16/kamailio.appl

@@ -22,7 +22,7 @@ packages:
   - libevent			# kamailio-json
   - libpurple			# kamailio-purple
   - libunistring		# kamailio-websocket
-  - libxml2			# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2			# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - mod_perl			# kamailio-perl
   - mono-core			# kamailio-mono
   - mysql-libs			# kamailio-mysql

pkg/kamailio/fedora/16/kamailio.spec

@@ -24,7 +24,8 @@ Conflicts:     kamailio-tls < %ver, kamailio-purple < %ver, kamailio-ldap < %ver
 Conflicts:     kamailio-xmlrpc < %ver, kamailio-perl < %ver, kamailio-lua < %ver
 Conflicts:     kamailio-python < %ver, kamailio-regex < %ver
 Conflicts:     kamailio-dialplan < %ver, kamailio-lcr < %ver
-Conflicts:     kamailio-xmlops < %ver, kamailio-websocket < %ver
+Conflicts:     kamailio-xmlops < %ver, kamailio-cdp < %ver
+Conflicts:     kamailio-websocket < %ver
 %if 0%{?fedora}
 Conflicts:     kamailio-radius < %ver, kamailio-carrierroute < %ver
 Conflicts:     kamailio-redis < %ver, kamailio-json < %ver 
@@ -273,6 +274,17 @@ BuildRequires: glib2-devel, libpurple-devel, libxml2-devel
 %description purple
 Multi-protocol IM and presence gateway module.
 
+
+%package  cdp
+Summary:  C Diameter Peer module and extensions module for Kamailio.
+Group:    System Environment/Daemons
+Requires: libxml2, kamailio = %ver
+BuildRequires: libxml2-devel
+
+%description cdp
+C Diameter Peer module and extensions module for Kamailio.
+
+
 %if 0%{?fedora}
 %package radius
 Summary:       Radius AAA API for Kamailio.
@@ -352,14 +364,14 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\
 	kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\
 	kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\
 	klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \
-	include_modules="xmlrpc xmlops"\
+	include_modules="xmlrpc xmlops cdp cdp_avp"\
 %else
 make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\
 	db_oracle memcached mi_xmlrpc osp" group_include="kstandard kmysql\
 	kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\
 	kcpl ksnmpstats kpresence kregex kdialplan\
 	klcr ksqlite kberkeley kwebsocket" \
-	include_modules="xmlrpc xmlops"
+	include_modules="xmlrpc xmlops cdp cdp_avp"
 %endif
 
 
@@ -374,7 +386,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\
 	kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\
 	kcpl ksnmpstats kcarrierroute kpresence kradius kgeoip kregex kdialplan\
 	klcr ksqlite kredis kjson kmono kberkeley kwebsocket" \
-	include_modules="xmlrpc xmlops"
+	include_modules="xmlrpc xmlops cdp cdp_avp"
 
 mkdir -p $RPM_BUILD_ROOT/%{_unitdir}
 install -m644 pkg/kamailio/fedora/%{?fedora}/kamailio.service \
@@ -389,7 +401,7 @@ make install-modules-all skip_modules="auth_identity db_cassandra iptrtpproxy\
 	kpostgres kunixodbc kldap kperl kpython klua kutils kpurple ktls kxmpp\
 	kcpl ksnmpstats kpresence kregex kdialplan\
 	klcr ksqlite kberkeley kwebsocket" \
-	include_modules="xmlrpc xmlops"
+	include_modules="xmlrpc xmlops cdp cdp_avp"
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \
@@ -902,6 +914,14 @@ fi
 %{_libdir}/kamailio/modules/xmlops.so
 
 
+%files cdp
+%defattr(-,root,root)
+%doc %{_docdir}/kamailio/modules/README.cdp
+%{_libdir}/kamailio/modules/cdp.so
+%doc %{_docdir}/kamailio/modules/README.cdp_avp
+%{_libdir}/kamailio/modules/cdp_avp.so
+
+
 %files websocket
 %defattr(-,root,root)
 %doc %{_docdir}/kamailio/modules/README.websocket
@@ -956,6 +976,8 @@ fi
 
 
 %changelog
+* Thu Jul 5 2012 Peter Dunkley <[email protected]>
+  - Added kamailio-cdp RPM for cdp and cdp_avp modules
 * Tue Jul 3 2012 Peter Dunkley <[email protected]>
   - Updates to websocket module
 * Sat Jun 30 2012 Peter Dunkley <[email protected]>

pkg/kamailio/fedora/17/README

@@ -0,0 +1 @@
+../16/README

pkg/kamailio/fedora/17/kamailio-build.appl

@@ -26,7 +26,7 @@ packages:
   - libevent-devel		# kamailio-json
   - libpurple-devel		# kamailio-purple
   - libunistring-devel		# kamailio-websocket
-  - libxml2-devel		# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2-devel		# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - lua-devel			# kamailio-lua
   - make			# kamailio
   - mod_perl-devel		# kamailio-perl

pkg/kamailio/fedora/17/kamailio.appl

@@ -22,7 +22,7 @@ packages:
   - libevent			# kamailio-json
   - libpurple			# kamailio-purple
   - libunistring		# kamailio-websocket
-  - libxml2			# kamailio-utils, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-xmlrpc, kamailio-xmlops
+  - libxml2			# kamailio-cdp, kamailio-cpl, kamailio-presence, kamailio-purple, kamailio-utils, kamailio-xmlops, kamailio-xmlrpc
   - mod_perl			# kamailio-perl
   - mono-core			# kamailio-mono
   - mysql-libs			# kamailio-mysql