@@ -508,11 +508,11 @@ A) Getting Help

   http://www.kamailio.org to learn how to configure Kamailio for your site.

   If the documentation does not resolve your problem you may try contacting

-  our user forum by E-mail at sr-users@lists.sip-router.org -- that is the

+  our user forum by E-mail at sr-users@lists.kamailio.org -- that is the

   mailing list of the Kamailio community. To participate in the mailing list,

   please subscribe at the following web address:

-  https://lists.sip-router.org/cgi-bin/mailman/listinfo

+  https://lists.kamailio.org/cgi-bin/mailman/listinfo

 B) Disclaimers

@@ -545,14 +545,6 @@ C) Quick Start

     		rpm -i <package_name>

 	debian:

     		dpkg -i <package_name>

-	gentoo:

-		emerge kamailio

-		(or if use only stable packets:

-		ACCEPT_KEYWORDS="~x86" emerge kamailio )

-	tar.gz:

-    		cd /; tar zxvf <package_name>_os_arch.tar.gz

-    		(it will install in /usr/local/, and the configuration file in

-		/usr/local/etc/kamailio/kamailio.cfg)

 	Solaris:

     		gunzip <package_name>.gz ; pkgadd -d <package_name>

 	*BSD:

@@ -560,7 +552,7 @@ C) Quick Start

   3) Start the server

-	RPM + gentoo:

+	RPM:

     		/etc/init.d/kamailio start

 	debian:

     		Kamailio is started automatically after the install

@@ -621,8 +613,6 @@ D) Kamailio With Persistent Data Storage

     (rpm and deb provided, most of the binary tar.gz distributions and the

      solaris package include it; if it is not present you'll have to rebuild

      from the source).

-	For gentoo please include 'mysql' to your USE variable in /etc/make.conf

-	or give it as variable to the emerge command.

   2) install the package

     rpm -i <package_name>

@@ -10,14 +10,14 @@

   Welcome! This is an amazingly flexible, robust and secure SIP server

   built on years of experience in several Open Source projects. It's a merge

   of the SIP Express Router (SER) and the Kamailio (OpenSER) products produced

-  by a joint development team. 

+  by a joint development team.

   This memo gives you hints on how to set up the Kamailio quickly.

-  

+

   You can find a similar tutorial and many more on project's web site:

-    - http://www.kamailio.org/w/documentation/

-    - http://www.kamailio.org/wiki/

-  

+    - https://www.kamailio.org/w/documentation/

+    - https://www.kamailio.org/wiki/

+

 Table of Contents

 =================

@@ -63,7 +63,7 @@ There are various configuration options defined in the Makefile.

 Requirements:

-- gcc or clang: 

+- gcc or clang:

      gcc >= 2.9x; 3.[12] recommended (it will work with older version

      but it might require some options tweaking for best performance)

      clang >= version 3.3

@@ -76,10 +76,10 @@ Requirements:

 - GNU install, BSD install or Solaris install if you want "make

   install", "make bin", "make sunpkg" to work

 - libmysqlclient & libz (zlib) if you want MySQL support (the db_mysql module)

-- libxml2 if you want to compile the cpl-c (CPL support) or pa (presence) 

+- libxml2 if you want to compile the cpl-c (CPL support) or pa (presence)

    modules

-- freeradius or libradiusclient-ng (> 5.0) if you need RADIUS support (the auth_radius,

-  group_radius, uri_radius and avp_radius modules)

+- freeradius, radcli or libradiusclient-ng (> 5.0) if you need RADIUS support

+  (the auth_radius, acc_radius and misc_radius modules)

 - libpq if you need PostgreSQL support (the db_postgres module)

 - libexpat if you want the jabber gateway support (the jabber module) or the

   XMPP gateway support

@@ -91,7 +91,7 @@ Requirements:

   DB underlayer

 - libperl - libs and devel headers - if you want the perl connector to support

   perl scripting from your config file (perl module)

-- libsnmp9 - libs and devel headers - if you want SNMP client functionality 

+- libsnmp9 - libs and devel headers - if you want SNMP client functionality

   (SNMP AgentX subagent) for Kamailio

 - libldap libs and devel headers v2.1 or greater - if you want LDAP support

 - libpcre libs and devel headers - if you want to compile the lcr and dialplan

@@ -109,7 +109,7 @@ in the README for the specific module.

 OS Notes:

  FreeBSD/OpenBSD/NetBSD: make sure gmake, bison or yacc & flex are installed.

-  

+

   FreeBSD 5.4:

   ------------

   If you want to compile all the modules, you will need the following packages:

@@ -119,10 +119,10 @@ OS Notes:

     libpq

   - expat-1.95.8 (/usr/ports/textproc/expat2) for libexpat

   - libxml2-2.6.18 (/usr/ports/textproc/libxml2) for libxml2

-  - radiusclient-0.4.7 (/usr/ports/net/radiusclient) for libradiusclient-ng 

+  - radiusclient-0.4.7 (/usr/ports/net/radiusclient) for libradiusclient-ng

   NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you

   use the 0.4.* version.

-  

+

   Compile example (all the modules and SIP server core in a tar.gz):

      gmake bin radiusclient_ng=4 include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"

@@ -131,10 +131,10 @@ OS Notes:

   - mysql-client-4.0.23 (/usr/ports/databases/mysql) for libmysqlclient

   - expat-1.95.6 (/usr/ports/textproc/expat) for libexpat

   - libxml-2.6.16p0 (/usr/ports/textproc/libxml) for libxml2

-  - radiusclient-ng-0.5.1 from 

+  - radiusclient-ng-0.5.1 from

    http://download.berlios.de/radiusclient-ng/radiusclient-ng-0.5.1.tar.gz

-   (you need to download and install it, since there is no "official" 

-   openbsd port for it) for libradiusclient-ng 

+   (you need to download and install it, since there is no "official"

+   openbsd port for it) for libradiusclient-ng

   Compile example (all the modules and SIP server core in a tar.gz):

      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"

@@ -145,7 +145,7 @@ OS Notes:

   - expat-1.95.8nb2 (/usr/pkgsrc/textproc/expat) for libexpat

   - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2

   - radiusclient-ng-0.5.1 (see OpenBSD)

-  

+

   Compile example (all the modules and SIP server in a tar.gz):

      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"

@@ -156,7 +156,7 @@ OS Notes:

   install, just make sure it's in the PATH (it's usually in /usr/sbin) and

   add INSTALL=install either to the environment or to the make command line

   (e.g.: gmake INSTALL=install all).

-  

+

   Compile example (all the modules and SIP server in a tar.gz):

      gmake bin INSTALL=install include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"

@@ -183,11 +183,11 @@ OS Notes:

  --------------------------------------

  make sure make, bison, flex, minires and minires-devel (needed for the

  resolver functions) are installed.

- 

+

  Only building Kamailio's core and some static modules is supported for now.

  Stuff known not to work:

            - IPv6 (cygwin doesn't support it yet)

-           - TCP (the tcp code heavily depends on file descriptor passing 

+           - TCP (the tcp code heavily depends on file descriptor passing

              between processes, which is not yet supported by cygwin)

            - dynamic modules (non statically linked -- not supported because

              backlinking doesn't work in windows by design)

@@ -224,7 +224,7 @@ tls, run:

   make install

 2.2 Details - Installing From Source Code

-.......................................

+.........................................

 Build Commands

@@ -236,8 +236,8 @@ Build Commands

 	make

 Compile modules except some explicitly excepted (see below)

-	make modules  - all modules in the modules/ directory 

-	make modules-all or make every-module  - all the modules 

+	make modules  - all modules in the modules/ directory

+	make modules-all or make every-module  - all the modules

 * Compile all:

 	make all

@@ -296,7 +296,7 @@ are grouped based on Debian packaging rules. For example:

   Ex. to make a standard installation with MySQL, use:

 	make group_include="standard mysql" all

-  In addition to group_include (or instead), you can use 

+  In addition to group_include (or instead), you can use

 	include_modules="modA modB"

   to specify exactly the modules you want to include, ex.

 	make include_modules="mymodule" modules

@@ -326,18 +326,18 @@ are grouped based on Debian packaging rules. For example:

 	make mode=debug PROFILE=-pg all

   - compile only the print module

 	make modules=modules/print modules

-  - compile by default only the print module, in debuging mode and with 

+  - compile by default only the print module, in debuging mode and with

     profiling:

 	make cfg modules=modules/print mode=debug PROFILE=-pg

 	make all

   - change & save the  modules list without rebuilding the whole config

-    (so that already compiled modules won't be re-compiled by 

+    (so that already compiled modules won't be re-compiled by

     make all/make modules):

 	make modules-cfg include_modules="mysql postgress"

   - change only the compile/build options, without changing the modules list:

 	make cfg-defs CPU=ultrasparc PROFILE=-pg

-  - compile by default all the usual modules + mysql and postgres, optimized 

-     for pentium-m and for space (saves both the build options and the module 

+  - compile by default all the usual modules + mysql and postgres, optimized

+     for pentium-m and for space (saves both the build options and the module

      list)

 	make cfg include_modules="mysql postgres" CPU=pentium-m CC_EXTRA_OPTS=-Os

 	make all

@@ -370,16 +370,16 @@ Make Local Build Config:

   * make cfg or make config - force config and module list regeneration

-  Example: 

+  Example:

 	make cfg include_modules=mysql mode=debug

   All future make invocations will include the mysql module and will build in debug mode

-  Note: If config.mak doesn't exist (e.g. initial checkout or after a make 

+  Note: If config.mak doesn't exist (e.g. initial checkout or after a make

   proper) or if Makefile.defs was changed, the config will be re-generated

   automatically by the first make command. For example:

   	make cfg  include_modules=db_mysql; make all

-  is equivalent to 

+  is equivalent to

  	rm config.mak modules.lst; make include_modules=db_mysql.

   * make cfg-defs  (force config regeneration, but don't touch the module list)

@@ -400,7 +400,7 @@ Clean:

   * make clean   	- clean the base and modules too

   * make proper  	- clean also the dependencies and the config, but not the module list

   * make distclean 	- the same as proper

-  * make maintainer-clean - clean everything, including make's config, saved 

+  * make maintainer-clean - clean everything, including make's config, saved

   			  module list, auto generated files, tags, *.dbg a.s.o

   * make clean-all	- clean all the modules in modules/*

   * make proper-all 	- like make proper but for all the  modules in modules/*

@@ -427,7 +427,7 @@ Compile:

   * make proper-utils   - like make proper, but only for utils

   * make

      or gmake on non-Linux systems

-  * make modules 

+  * make modules

      or make modules exclude_modules="CVS print" etc.

 Other Make Targets:

@@ -473,9 +473,9 @@ Install:

   to use this parameter in previous make commands, i.e. make, make modules,

   or make all. If you fail to do this then Kamailio will look for the default

   configuration file in a wrong directory, because the directory of the

-  default configuration file is hardcoded into Kamailio during compile time. 

-  When you use a different prefix parameter when installing then the 

-  directory hard coded in Kamailio and the directory in which the file will be 

+  default configuration file is hardcoded into Kamailio during compile time.

+  When you use a different prefix parameter when installing then the

+  directory hard coded in Kamailio and the directory in which the file will be

   installed by make install will not match. (You can specify exact location

   of the configuration file using -f parameter of Kamailio).

@@ -507,7 +507,7 @@ A) Getting Help

   check the documentation at the Kamailio web site

   http://www.kamailio.org to learn how to configure Kamailio for your site.

-  If the documentation does not resolve your problem you may try contacting 

+  If the documentation does not resolve your problem you may try contacting

   our user forum by E-mail at sr-users@lists.sip-router.org -- that is the

   mailing list of the Kamailio community. To participate in the mailing list,

   please subscribe at the following web address:

@@ -515,16 +515,16 @@ A) Getting Help

   https://lists.sip-router.org/cgi-bin/mailman/listinfo

 B) Disclaimers

- 

-  Note well the default "quick-start" configuration is very simple in order 

-  to be easily installable. It provides minimum features. Particularly, 

+

+  Note well the default "quick-start" configuration is very simple in order

+  to be easily installable. It provides minimum features. Particularly,

   authentication is by default disabled, which means anyone can register using

-  any name with the server. (This is on purpose to avoid installation 

+  any name with the server. (This is on purpose to avoid installation

   dependencies on a database, which is needed for storing user credentials.)

 C) Quick Start

-  The following step-by step guide gives you instructions how to install the 

+  The following step-by step guide gives you instructions how to install the

   SQL-free distribution of Kamailio. If you need persistence and

   authentication, then you have to install additional database support --

   proceed to section D) after you are finished with C).

@@ -547,7 +547,7 @@ C) Quick Start

     		dpkg -i <package_name>

 	gentoo:

 		emerge kamailio

-		(or if use only stable packets: 

+		(or if use only stable packets:

 		ACCEPT_KEYWORDS="~x86" emerge kamailio )

 	tar.gz:

     		cd /; tar zxvf <package_name>_os_arch.tar.gz

@@ -557,7 +557,7 @@ C) Quick Start

     		gunzip <package_name>.gz ; pkgadd -d <package_name>

 	*BSD:

     		pkg_add package_name

-    

+

   3) Start the server

 	RPM + gentoo:

@@ -572,10 +572,10 @@ C) Quick Start

     		pkg/kamailio/rpm/kamailio.init, pkg/kamailio/deb/debian/kamailio.init, a.s.o.)

     		You can start Kamailio directly with

 			/usr/local/sbin/kamailio.

-    

+

   4) Optionally, watch server's health using the kamctl utility

-    - to do so, first set the environment variable SIP_DOMAIN to your domain 

+    - to do so, first set the environment variable SIP_DOMAIN to your domain

       name, e.g., in Bourne shell, call

         export SIP_DOMAIN="myserver.foobar.com"

 	- if you are using other than 'localhost' mysql server for maintaining

@@ -589,7 +589,7 @@ C) Quick Start

   5) Connect SIP phones

-  Register with the server using your favorite SIP User Agent (phone). 

+  Register with the server using your favorite SIP User Agent (phone).

   In most cases, you need to set the following options:

@@ -602,10 +602,10 @@ C) Quick Start

 D) Kamailio With Persistent Data Storage

 ------------------------------------------

-  The default configuration is very simple and features many simplifications. 

-  In particular, it does not authenticate users and loses User Location database 

-  on reboot. To provide persistence, keep user credentials and remember users' 

-  locations across reboots, Kamailio can be configured to use a database, like MySQL. 

+  The default configuration is very simple and features many simplifications.

+  In particular, it does not authenticate users and loses User Location database

+  on reboot. To provide persistence, keep user credentials and remember users'

+  locations across reboots, Kamailio can be configured to use a database, like MySQL.

   Before you proceed, you need to make sure MySQL is installed on your box. Your

   MySQL server must be configured to deal with a large number of

@@ -615,10 +615,10 @@ D) Kamailio With Persistent Data Storage

    set-variable    = max_connections=500

   1) Download the package containing mysql support for Kamailio from the links

-     you find on: 

+     you find on:

         https://www.kamailio.org/wiki/

-    (rpm and deb provided, most of the binary tar.gz distributions and the 

+    (rpm and deb provided, most of the binary tar.gz distributions and the

      solaris package include it; if it is not present you'll have to rebuild

      from the source).

 	For gentoo please include 'mysql' to your USE variable in /etc/make.conf

@@ -633,9 +633,9 @@ D) Kamailio With Persistent Data Storage

 	(if do not want to put 'mysql' into your USE variable you can type:

 	 USE="mysql" emerge kamailio)

-  3) create MySQL tables for Kamailio 

+  3) create MySQL tables for Kamailio

 	- if you have a previously installed Kamailio on your system, use

-    	/usr/local/sbin/kamdbctl reinstall 

+    	/usr/local/sbin/kamdbctl reinstall

 	  to convert your Kamailio database into new structures

 	- otherwise, if this is your very first installation, use

     	/usr/local/sbin/kamdbctl create

@@ -651,16 +651,16 @@ D) Kamailio With Persistent Data Storage

     - modparam("auth", "calculate_ha1", yes)

     - modparam("auth_db", "password_column", "password")

     - if (!www_authorize("example.com", "subscriber")) {

-        www_challenge("example.com", "0"); 

+        www_challenge("example.com", "0");

         break;

       }

-  5) be sure to replace realm, the first parameter in www_* actions, 

-     with name of your server; some broken UAC implementations don't 

+  5) be sure to replace realm, the first parameter in www_* actions,

+     with name of your server; some broken UAC implementations don't

      authenticate otherwise; the authentication command in your

      configuration script should look then like this:

         if (!www_authorize("myserver.foobar.com", "subscriber")) {

-            www_challenge("myserver.foobar.com", "0"); 

+            www_challenge("myserver.foobar.com", "0");

             break;

         }

@@ -668,25 +668,25 @@ D) Kamailio With Persistent Data Storage

       /etc/init.d/kamailio restart

-  7) you can now start managing the server using the kamctl utility; 

-     you need to first set the environment variable SIP_DOMAIN to your 

+  7) you can now start managing the server using the kamctl utility;

+     you need to first set the environment variable SIP_DOMAIN to your

      local SIP realm, e.g.,

        export SIP_DOMAIN="myserver.example.com"

    	a) watch the server status using 'kamctl moni'

    	b) try to login with your SIP client as user 'admin' with password 'heslo'

-   	c) try adding new users using 

+   	c) try adding new users using

        		'kamctl add <username> <password>'

 4. Troubleshooting

 ------------------

-Q: SIP requests are replied by Kamailio with "483 Too Many Hops" or 

+Q: SIP requests are replied by Kamailio with "483 Too Many Hops" or

    "513 Message Too Large"

-A: In both cases, the reason is probably an error in request routing script 

-   which caused an infinite loop. You can easily verify whether this happens 

+A: In both cases, the reason is probably an error in request routing script

+   which caused an infinite loop. You can easily verify whether this happens

    by watching SIP traffic on loopback interface. A typical reason for

    misrouting is a failure to match local domain correctly. If a server

    fails to recognize a request for itself, it will try to forward it to

@@ -63,8 +63,10 @@ There are various configuration options defined in the Makefile.

 Requirements:

-- gcc or icc : gcc >= 2.9x; 3.[12] recommended (it will work with older version

-  but it might require some options tweaking for best performance)

+- gcc or clang: 

+     gcc >= 2.9x; 3.[12] recommended (it will work with older version

+     but it might require some options tweaking for best performance)

+     clang >= version 3.3

 - bison or yacc (Berkley Yacc)

 - flex

 - GNU make (on Linux this is the standard "make", on *BSD and Solaris it is

@@ -23,16 +23,15 @@ Table of Contents

 =================

 1. Supported Architectures And Requirements

-2. How-To Build SIP Server From The Source Code Distribution

+2. How-To Build Kamailio From The Source Code Distribution

    2.1 Kamailio Fast Track Installation

    2.2 Details Installing From Source Code

-     A) Set SIP Server Flavour

-     B) Build Commands

+     A) Build Commands

 3. Quick-Start Installation Guide

    A) Getting Help

    B) Disclaimers

-   C) Quick Atart

-   D) SIP Server With Persistent Data Storage

+   C) Quick Start

+   D) Kamailio With Persistent Data Storage

 4. Troubleshooting

@@ -45,6 +44,9 @@ Supported operating systems:

  - Solaris

  - OS/X, Darwin

+Note that some modules have dependencies on the Linux operating system.

+This is clearly noted in the README files.

+

 Partially supported

  - Windows+Cygwin (core + static modules only, no IPv6, no

    TCP, no dynamic modules)

@@ -74,7 +76,7 @@ Requirements:

 - libmysqlclient & libz (zlib) if you want MySQL support (the db_mysql module)

 - libxml2 if you want to compile the cpl-c (CPL support) or pa (presence) 

    modules

-- libradiusclient-ng (> 5.0) if you need RADIUS support (the auth_radius,

+- freeradius or libradiusclient-ng (> 5.0) if you need RADIUS support (the auth_radius,

   group_radius, uri_radius and avp_radius modules)

 - libpq if you need PostgreSQL support (the db_postgres module)

 - libexpat if you want the jabber gateway support (the jabber module) or the

@@ -85,8 +87,6 @@ Requirements:

   with radius support - authentication, accounting, group support, etc

 - unixodbc - libs and devel headers - if you want UNIXODBC support as

   DB underlayer

-- libxmlrpc-c3 - libs and devel headers - if you want to have XML-RPC support

-  for the management interface (MI)

 - libperl - libs and devel headers - if you want the perl connector to support

   perl scripting from your config file (perl module)

 - libsnmp9 - libs and devel headers - if you want SNMP client functionality 

@@ -101,6 +101,8 @@ Requirements:

 - jdk and gcj for Java module

 - the jansson library for the jansson module used for JSON document handling

+Some modules have other requirements on third-party libraries. This is documented

+in the README for the specific module.

 OS Notes:

@@ -158,6 +160,9 @@ OS Notes:

   Linux

   -----

+  Kamailio is part of the official Debian distribution. You can download binary modules

+  directly using normal packet management.

+

   Needed packages for compiling all the modules:

   * Debian:

       - libmysqlclient-dev for libmysqlclient

@@ -171,6 +176,7 @@ OS Notes:

 	install the binaries easily - see the web site for more details:

 	  - http://kamailio.org

+

  Cygwin  (alpha state, partial support)

  --------------------------------------

  make sure make, bison, flex, minires and minires-devel (needed for the

@@ -215,13 +221,13 @@ tls, run:

   make all

   make install

-2.2 Details Installing From Source Code

+2.2 Details - Installing From Source Code

 .......................................

 Build Commands

   Kamailio is split in four main parts: The core, the modules, the

-  utilties, and scripts/examples.  When you build, you can decide to build

+  utilities, and the various scripts/examples.  When you build, you can decide to build

   only the core, the modules, both, or all.

 * Compile Kamailio core only:

@@ -399,23 +405,24 @@ Clean:

   Config clean:

-  * make clean-cfg (cleans the compile config)

-  * make clean-modules-cfg (cleans the modules list)

+  * make clean-cfg       - cleans the compile config

+  * make clean-modules-cfg  - cleans the modules list

-  Reduced" clean:

+  Reduced clean:

   * make local-clean  	- cleans only the core, no libs, utils or modules

   * make clean-modules  - like make clean, but cleans only the modules

   * make clean-libs     - like make clean, but cleans only the libs

   * make clean-utils    - like make clean, but cleans only the utils

-  * make proper-modules - like make proper, but only for modules

-  * make proper-libs    - like make proper, but only for libs

-  * make proper-utils   - like make proper, but only for utils

+

 Compile:

 --------

   * make proper

      optional: make cfg  <various cfg. options that should be saved>

+  * make proper-modules - like make proper, but only for modules

+  * make proper-libs    - like make proper, but only for libs

+  * make proper-utils   - like make proper, but only for utils

   * make

      or gmake on non-Linux systems

   * make modules 

@@ -503,7 +510,7 @@ A) Getting Help

   mailing list of the Kamailio community. To participate in the mailing list,

   please subscribe at the following web address:

-  http://lists.sip-router.org/cgi-bin/mailman/listinfo

+  https://lists.sip-router.org/cgi-bin/mailman/listinfo

 B) Disclaimers

@@ -522,11 +529,11 @@ C) Quick Start

   1) Download an RPM or Debian package from the links on the wiki

-    http://www.kamailio.org/wiki/

+    https://www.kamailio.org/wiki/

   If you don't use an rpm or debian based distribution, try our tar.gz'ed

   binaries

-    http://www.kamailio.org/pub/kamailio/latest/src/

+    https://www.kamailio.org/pub/kamailio/latest/src/

   If you use Solaris 8 you can try our solaris package.

   If you use Gentoo Linux you do not have to download a package.

@@ -537,15 +544,13 @@ C) Quick Start

 	debian:

     		dpkg -i <package_name>

 	gentoo:

-    		emerge ser

-			  or

-			emerge kamailio

-		(or if use only stable packets: ACCEPT_KEYWORDS="~x86" emerge ser

-		or ACCEPT_KEYWORDS="~x86" emerge kamailio)

+		emerge kamailio

+		(or if use only stable packets: 

+		ACCEPT_KEYWORDS="~x86" emerge kamailio )

 	tar.gz:

     		cd /; tar zxvf <package_name>_os_arch.tar.gz

     		(it will install in /usr/local/, and the configuration file in

-     		/usr/local/etc/ser/ser.cfg or /usr/local/etc/kamailio/kamailio.cfg)

+		/usr/local/etc/kamailio/kamailio.cfg)

 	Solaris:

     		gunzip <package_name>.gz ; pkgadd -d <package_name>

 	*BSD:

@@ -562,8 +567,7 @@ C) Quick Start

 	Solaris:

     		the tar.gz does not include an init.d script, you'll have to create one of

     		your own or adapt one from the source distribution (pkg/debian/init.d,

-    		pkg/rpm/ser.init.*, pkg/gentoo/ser.init, pkg/kamailio/rpm/kamailio.init,

-			pkg/kamailio/deb/debian/kamailio.init, a.s.o.)

+    		pkg/kamailio/rpm/kamailio.init, pkg/kamailio/deb/debian/kamailio.init, a.s.o.)

     		You can start Kamailio directly with

 			/usr/local/sbin/kamailio.

@@ -574,7 +578,7 @@ C) Quick Start

         export SIP_DOMAIN="myserver.foobar.com"

 	- if you are using other than 'localhost' mysql server for maintaining

 	  subscriber database, change the variable 'SQL_HOST' to the proper

-	  host name in the serctl script

+	  host name in the kamctl script

     - run the kamctl utility

         /usr/sbin/kamctl moni

       or

@@ -608,9 +612,9 @@ D) Kamailio With Persistent Data Storage

    set-variable    = max_connections=500

-  1) Download the package containin mysql support for Kamailio from the links

+  1) Download the package containing mysql support for Kamailio from the links

      you find on: 

-        http://www.kamailio.org/wiki/

+        https://www.kamailio.org/wiki/

     (rpm and deb provided, most of the binary tar.gz distributions and the 

      solaris package include it; if it is not present you'll have to rebuild

@@ -634,7 +638,7 @@ D) Kamailio With Persistent Data Storage

 	- otherwise, if this is your very first installation, use

     	/usr/local/sbin/kamdbctl create

 	  to create Kamailio database structures

-   (you will be prompted for password of MySql "root" user)

+     (you will be prompted for password of MySql "root" user)

   4) configure Kamailio to use SQL

     uncomment all lines in configuration file kamailio.cfg which are related to authentication:

@@ -644,33 +648,33 @@ D) Kamailio With Persistent Data Storage

     - modparam("usrloc", "db_mode", 2)

     - modparam("auth", "calculate_ha1", yes)

     - modparam("auth_db", "password_column", "password")

-    - if (!www_authorize("sip-router.org", "subscriber")) {

-        www_challenge("sip-router.org", "0"); 

+    - if (!www_authorize("example.com", "subscriber")) {

+        www_challenge("example.com", "0"); 

         break;

       }

   5) be sure to replace realm, the first parameter in www_* actions, 

-   with name of your server; some broken UAC implementations don't 

-   authenticate otherwise; the authentication command in your

-   configuration script should look then like this:

-      if (!www_authorize("myserver.foobar.com", "subscriber")) {

-        www_challenge("myserver.foobar.com", "0"); 

-        break;

-      }

+     with name of your server; some broken UAC implementations don't 

+     authenticate otherwise; the authentication command in your

+     configuration script should look then like this:

+        if (!www_authorize("myserver.foobar.com", "subscriber")) {

+            www_challenge("myserver.foobar.com", "0"); 

+            break;

+        }

   6) restart the server

-    /etc/init.d/kamailio restart

+      /etc/init.d/kamailio restart

-  7) you can now start  managing the server using the kamctl utility; 

-   you need to first set the environment variable SIP_DOMAIN to your 

-   local SIP realm, e.g.,

-       export SIP_DOMAIN="myserver.foobar.com"

+  7) you can now start managing the server using the kamctl utility; 

+     you need to first set the environment variable SIP_DOMAIN to your 

+     local SIP realm, e.g.,

+       export SIP_DOMAIN="myserver.example.com"

-   a) watch the server status using 'kamctl moni'

-   b) try to login with your SIP client as user 'admin' with password 'heslo'

-   c) try adding new users using 

-       'kamctl add <username> <password>'

+   	a) watch the server status using 'kamctl moni'

+   	b) try to login with your SIP client as user 'admin' with password 'heslo'

+   	c) try adding new users using 

+       		'kamctl add <username> <password>'

 4. Troubleshooting

@@ -699,4 +703,4 @@ A: Use bug tracker at: https://github.com/kamailio/kamailio/issues

 Q: Any F.A.Q. that could be helpful to check before reporting an issue?

-A: See: http://www.kamailio.org/wiki/tutorials/faq/main

+A: See: https://www.kamailio.org/wiki/tutorials/faq/main

@@ -10,10 +10,9 @@

   Welcome! This is an amazingly flexible, robust and secure SIP server

   built on years of experience in several Open Source projects. It's a merge

   of the SIP Express Router (SER) and the Kamailio (OpenSER) products produced

-  by a joint development team. When not explicitely mentioned, SIP server refers

-  to any of these two applications.

+  by a joint development team. 

-  This memo gives you hints on how to set up the SIP server quickly.

+  This memo gives you hints on how to set up the Kamailio quickly.

   You can find a similar tutorial and many more on project's web site:

     - http://www.kamailio.org/w/documentation/

@@ -23,53 +22,21 @@

 Table of Contents

 =================

-1. SIP Server Flavours

-2. Supported Architectures And Requirements

-3. How-To Build SIP Server From The Source Code Distribution

-   3.1 Kamailio Fast Track Installation

-   3.2 Details Installing From Source Code

+1. Supported Architectures And Requirements

+2. How-To Build SIP Server From The Source Code Distribution

+   2.1 Kamailio Fast Track Installation

+   2.2 Details Installing From Source Code

      A) Set SIP Server Flavour

      B) Build Commands

-4. Quick-Start Installation Guide

+3. Quick-Start Installation Guide

    A) Getting Help

    B) Disclaimers

    C) Quick Atart

    D) SIP Server With Persistent Data Storage

-5. Troubleshooting

-

-

-

-1. SIP Server Flavours

-

-The two major SIP server flavours are:

-  - SIP Express Router (aka SER, the initial project name, started in 2001)

-  - Kamailio (former OpenSER)

-

-Starting with version 3.0.0, the two SIP server flavours are built from

-same source code tree. In version 4.0.0 the two source code trees were

-merged even more, so a combined module directory is now used.

-

-Kamailio flavour is the one built by default. SER is, historically speaking, the

-first open source SIP server started in 2001. Kamailio forked from SER in

-2005 under the initial name OpenSER.

-

-Starting with version 3.1.0 the differences between the two flavours are

-very few, Kamailio enabling next compile time flags:

-  - internal statistics

-  - application server extensions in tm module

-

-In version 4.0.0 the modules were merged into one set and the merger

-between the two products was completed.

-

-Kamailio is now the default flavour. Switching between flavours is a matter

-of 'make' command parameters.

-

-Several installation tutorials for Kamailio are available on the web wiki:

-  - http://www.kamailio.org/wiki/

+4. Troubleshooting

-2. Supported Architectures And Requirements

+1. Supported Architectures And Requirements

 -------------------------------------------

 Supported operating systems:

@@ -92,7 +59,6 @@ Experimental architectures:

 There are various configuration options defined in the Makefile.

-

 Requirements:

 - gcc or icc : gcc >= 2.9x; 3.[12] recommended (it will work with older version

@@ -187,9 +153,6 @@ OS Notes:

   add INSTALL=install either to the environment or to the make command line

   (e.g.: gmake INSTALL=install all).

-  Needed packages:

-  [TODO]

-  

   Compile example (all the modules and SIP server in a tar.gz):

      gmake bin INSTALL=install include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"

@@ -204,8 +167,8 @@ OS Notes:

       - libradiusclient-ng-dev for libradiusclient

 	  - other libraries are needed for some other modules,

 	    see README of the module you want to use

-    Both SER and Kamailio flavours have APT deb repositories that allow you to

-	install the binaries easily - see the web sites for more details:

+    Kamailio have APT deb repositories that allow you to

+	install the binaries easily - see the web site for more details:

 	  - http://kamailio.org

  Cygwin  (alpha state, partial support)

@@ -213,7 +176,7 @@ OS Notes:

  make sure make, bison, flex, minires and minires-devel (needed for the

  resolver functions) are installed.

- Only building SIP server's core and some static modules is supported for now.

+ Only building Kamailio's core and some static modules is supported for now.

  Stuff known not to work:

            - IPv6 (cygwin doesn't support it yet)

            - TCP (the tcp code heavily depends on file descriptor passing 

@@ -222,16 +185,16 @@ OS Notes:

              backlinking doesn't work in windows by design)

-  Compile example (all the modules and SIP server in a tar.gz):

+  Compile example (all the modules and Kamailio in a tar.gz):

      make bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"

-3. Howto Build SIP Server From Source Code Distribution

+2. Howto Build Kamailio From Source Code Distribution

 -------------------------------------------------------

 (NOTE: if make doesn't work try gmake instead)

-3.1 Kamailio Fast Track Installation

+2.1 Kamailio Fast Track Installation

 ....................................

@@ -239,7 +202,7 @@ If you are familiar with Unix/Linux build tools aready and you installed

 the required dependencies, then you can just follow this section, otherwise

 skip over it.

-To get the SIP server installed, in the folder with source code run:

+To get Kamailio installed, in the folder with source code run:

   make cfg

   make all

@@ -252,31 +215,16 @@ tls, run:

   make all

   make install

-3.2 Details Installing From Source Code

+2.2 Details Installing From Source Code

 .......................................

+Build Commands

-A) Set SIP Server Flavour

-

-If you don't have a clean source tree, first do:

-   make proper

-

-To build Kamailio flavour, you don't need to do anything special, continue to

-read the section 3.B).

-

-To build SER flavour, you have to run first:

-   make FLAVOUR=ser cfg

-

-The parameter 'FLAVOUR=ser' must be given all the time when make target

-is 'cfg'.

-

-B) Build Commands

-

-  The SIP server is split in four main parts: The core, the modules, the

+  Kamailio is split in four main parts: The core, the modules, the

   utilties, and scripts/examples.  When you build, you can decide to build

   only the core, the modules, both, or all.

-* Compile SIP server core only:

+* Compile Kamailio core only:

 	make

 Compile modules except some explicitly excepted (see below)

@@ -290,23 +238,23 @@ Compile modules except some explicitly excepted (see below)

   By default make all will not build modules that require external libraries or

   that are considered to be "experimental". For example, modules that have external

   dependencies are: db_mysql, jabber, cpl-c, auth_radius, group_radius, uri_radius,

-  avp_radius, db_postgres, db_berkely, carrierroute, ...

+  avp_radius, db_postgres, db_berkeley, carrierroute, ...

 Including groups of modules: