Browse Source

* Core, etc, documentation: renamed ser to sip-router

* Renamed ser to sip-router in Makefile, etc files and some core files.
* Renamed some etc files from ser based name to  sip-router based name.
Juha Heinanen 16 years ago
parent
commit
5d1a75a61b
15 changed files with 272 additions and 254 deletions
  1. 116 98
      INSTALL
  2. 53 53
      Makefile
  3. 1 1
      Makefile.defs
  4. 1 1
      config.h
  5. 3 3
      etc/dbtext.cfg
  6. 0 0
      etc/dictionary.sip-router
  7. 12 12
      etc/nathelper.cfg
  8. 1 1
      etc/rules.m4
  9. 7 7
      etc/sip-router-basic.cfg
  10. 13 13
      etc/sip-router-oob.cfg
  11. 0 0
      etc/sip-router.cfg
  12. 23 23
      etc/sip-router.cfg.m4
  13. 17 17
      etc/sr
  14. 1 1
      rad_dict.h
  15. 24 24
      ser.8

+ 116 - 98
INSTALL

@@ -3,30 +3,30 @@ $Id$
 
 
      ===========================================
      ===========================================
 
 
-     SIP Express Router (ser) Installation Notes
+     SIP Router (sip-router) Installation Notes
 
 
-             http://www.iptel.org/ser/
+             http://sip-router.org
 
 
      ===========================================
      ===========================================
 
 
-  This memo gives you hints how to set up SER quickly. To 
-  understand how SER works and how to configure it properly,
-  read admin's guide available from SER website. We also
-  urge you to read latest ISSUES (available from SER website 
+  This memo gives you hints how to set up SIP Router quickly. To 
+  understand how SIP Router works and how to configure it properly,
+  read admin's guide available from SIP Router website. We also
+  urge you to read latest ISSUES (available from SIP Router website 
   too) and check for potential problems in this release.
   too) and check for potential problems in this release.
   Users of previous releases are encouraged to read NEWS to
   Users of previous releases are encouraged to read NEWS to
-  learn how to move to this new SER version.
+  learn how to move to this new SIP Router version.
   
   
 
 
 TOC
 TOC
 
 
 1. Supported Architectures and Requirements
 1. Supported Architectures and Requirements
-2. Howto Build ser From Source Distribution
+2. Howto Build sip-router From Source Distribution
 3. Quick-Start Installation Guide
 3. Quick-Start Installation Guide
    A) Getting Help
    A) Getting Help
    B) Disclaimers
    B) Disclaimers
    C) Quick Start
    C) Quick Start
-   D) ser with Persistent Data Storage
+   D) sip-router with Persistent Data Storage
 4. Troubleshooting
 4. Troubleshooting
 
 
 
 
@@ -35,10 +35,10 @@ TOC
 -------------------------------------------
 -------------------------------------------
 
 
 Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, Darwin
 Supported operating systems: Linux, FreeBSD, NetBSD, OpenBSD, Solaris, Darwin
-Partially supported: Windows+Cygwin (core + static modules only, no IPv6,
- no TCP, no dynamic modules)
+Partially supported: Windows+Cygwin (core + static modules only, no
+  IPv6, no TCP, no dynamic modules)
 Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc,
 Supported architectures: i386, x86_64 (amd64), armv4l, sparc64, powerpc,
- powerpc64
+  powerpc64
 Experimental architectures: mips1, mips2, sparc32, alpha
 Experimental architectures: mips1, mips2, sparc32, alpha
 
 
 (for other architectures the Makefiles might need to be edited)
 (for other architectures the Makefiles might need to be edited)
@@ -53,7 +53,7 @@ Requirements:
 - bison or yacc (Berkley yacc)
 - bison or yacc (Berkley yacc)
 - flex
 - flex
 - GNU make (on Linux this is the standard "make", on *BSD and Solaris is
 - GNU make (on Linux this is the standard "make", on *BSD and Solaris is
- called "gmake") version >= 3.80 (recommended 3.81).
+  called "gmake") version >= 3.80 (recommended 3.81).
 - sed and tr (used in the makefiles)
 - sed and tr (used in the makefiles)
 - GNU tar ("gtar" on Solaris) and gzip if you want "make tar" to work
 - GNU tar ("gtar" on Solaris) and gzip if you want "make tar" to work
 - GNU install, BSD install or Solaris install if you want "make
 - GNU install, BSD install or Solaris install if you want "make
@@ -61,9 +61,9 @@ Requirements:
 - libmysqlclient & libz (zlib) if you want mysql support (the mysql module)
 - libmysqlclient & libz (zlib) if you want mysql support (the mysql module)
 - libexpat if you want the jabber gateway support (the jabber module)
 - libexpat if you want the jabber gateway support (the jabber 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
+   modules
 - libradiusclient-ng (> 5.0) if you need radius support (the auth_radius,
 - libradiusclient-ng (> 5.0) if you need radius support (the auth_radius,
-group_radius, uri_radius and avp_radius modules)
+  group_radius, uri_radius and avp_radius modules)
 - libpq if you need postgres support (the postgres module)
 - libpq if you need postgres support (the postgres module)
 
 
 
 
@@ -84,7 +84,7 @@ OS Notes:
   NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you
   NOTE: you'll need to add radiusclient_ng=4 to the gmake command line if you
   use the 0.4.* version.
   use the 0.4.* version.
   
   
-  Compile example (all the modules and ser in a tar.gz):
+  Compile example (all the modules and sip-router in a tar.gz):
      gmake bin radiusclient_ng=4 include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
      gmake bin radiusclient_ng=4 include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
 
 
   OpenBSD 3.7
   OpenBSD 3.7
@@ -95,7 +95,7 @@ OS Notes:
    http://download.berlios.de/radiusclient-ng/radiusclient-ng-0.5.1.tar.gz
    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" 
    (you need to download and install it, since there is no "official" 
    openbsd port for it) for libradiusclient-ng 
    openbsd port for it) for libradiusclient-ng 
-  Compile example (all the modules and ser in a tar.gz):
+  Compile example (all the modules and sip-router in a tar.gz):
      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"
      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"
 
 
   NetBSD 2.0
   NetBSD 2.0
@@ -104,7 +104,7 @@ OS Notes:
   - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2
   - libxml2-2.6.19 (/usr/pkgsrc/textproc/libxml2) for libxml2
   - radiusclient-ng-0.5.1 (see OpenBSD)
   - radiusclient-ng-0.5.1 (see OpenBSD)
   
   
-  Compile example (all the modules and ser in a tar.gz):
+  Compile example (all the modules and sip-router in a tar.gz):
      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"
      gmake bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius pa"
 
 
  Solaris 10
  Solaris 10
@@ -118,7 +118,7 @@ OS Notes:
   Needed packages:
   Needed packages:
   [TODO]
   [TODO]
   
   
-  Compile example (all the modules and ser in a tar.gz):
+  Compile example (all the modules and sip-router in a tar.gz):
      gmake bin INSTALL=install include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
      gmake bin INSTALL=install include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
 
 
  Linux
  Linux
@@ -131,20 +131,21 @@ OS Notes:
       - libxml2-dev for libxml2
       - libxml2-dev for libxml2
       - libradiusclient-ng-dev for libradiusclient (you can download the 
       - libradiusclient-ng-dev for libradiusclient (you can download the 
       package from http://apt.sip-router.org/debian/dists/unstable/main/binary-i386/libradiusclient-ng-dev_0.5.1-0.5_i386.deb ).
       package from http://apt.sip-router.org/debian/dists/unstable/main/binary-i386/libradiusclient-ng-dev_0.5.1-0.5_i386.deb ).
-      NOTE: you can get up-to-date ser packages or libradiusclient packages
+      NOTE: you can get up-to-date sip-router packages or libradiusclient packages
       from http://apt.sip-router.org: add to your /etc/apt/sources.list the
       from http://apt.sip-router.org: add to your /etc/apt/sources.list the
       following lines:
       following lines:
          deb http://apt.sip-router.org/debian testing main contrib non-free
          deb http://apt.sip-router.org/debian testing main contrib non-free
          deb http://apt.sip-router.org/debian unstable main contrib non-free
          deb http://apt.sip-router.org/debian unstable main contrib non-free
       and then: apt-get update; apt-get install libradiusclient-ng-dev
       and then: apt-get update; apt-get install libradiusclient-ng-dev
       (or, if you want to use the pre-built modules:
       (or, if you want to use the pre-built modules:
-       apt-get install ser ser-cpl-module ser-jabber-module ser-mysq-module ser-pa-module ser-postgres-module ser-radius-modules )
+       apt-get install sip-router sip-router-cpl-module sip-router-jabber-module sip-router-mysq-module sip-router-pa-module sip-router-postgres-module sip-router-radius-modules )
 
 
  Cygwin  (alpha state, partial support)
  Cygwin  (alpha state, partial support)
 
 
- make sure make, bison, flex, minires and minires-devel (needed for the resolver functions) are installed. 
+ make sure make, bison, flex, minires and minires-devel (needed for the
+ resolver functions) are installed.
  
  
- Only building ser's core and some static modules is supported for now.
+ Only building sip-router's core and some static modules is supported for now.
  Stuff known not to work:
  Stuff known not to work:
            - IPv6 (cygwin doesn't support it yet)
            - 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 
@@ -153,20 +154,21 @@ OS Notes:
              backlinking doesn't work in windows by design)
              backlinking doesn't work in windows by design)
 
 
 
 
-  Compile example (all the modules and ser in a tar.gz):
+  Compile example (all the modules and sip-router in a tar.gz):
      make bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
      make bin include_modules="mysql jabber cpl-c auth_radius group_radius uri_radius postgres pa"
 
 
 
 
-2. Howto Build ser From Source Distribution
+2. Howto Build sip-router From Source Distribution
 -------------------------------------------
 -------------------------------------------
 
 
 (NOTE: if make doesn't work try gmake  instead)
 (NOTE: if make doesn't work try gmake  instead)
 
 
-SER 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.
+SIP Router 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 SER core only:
-make   #builds only ser core, equivalent to make ser
+Compile SIP Router core only:
+make   #builds only sip-router core, equivalent to make sip-router
 
 
 Compile modules except some explicitly excepted (see below)
 Compile modules except some explicitly excepted (see below)
 make modules  
 make modules  
@@ -183,11 +185,11 @@ avp_radius, postgres, pa.
 Including groups of modules (available in >0.9.x):
 Including groups of modules (available in >0.9.x):
 Instead of compiling the default modules only, you can specify groups of
 Instead of compiling the default modules only, you can specify groups of
 modules to include, according to their status:
 modules to include, according to their status:
-standard - Modules in this group are considered a standard part of SER (due to widespread usage)
+standard - Modules in this group are considered a standard part of SIP Router (due to widespread usage)
     but they have no dependencies (note that some of these interplay with external systems.
     but they have no dependencies (note that some of these interplay with external systems.
     However, they don't have compile or link dependencies).
     However, they don't have compile or link dependencies).
 
 
-standard-dep -  Modules in this group are considered a standard part of SER (due to widespread usage)
+standard-dep -  Modules in this group are considered a standard part of SIP Router (due to widespread usage)
     but they have dependencies that most be satisfied for compilation.
     but they have dependencies that most be satisfied for compilation.
     NOTE! All presence modules (dialog, pa, presence_b2b, rls, xcap) have been included in this
     NOTE! All presence modules (dialog, pa, presence_b2b, rls, xcap) have been included in this
     group due to interdependencies
     group due to interdependencies
@@ -224,14 +226,18 @@ You can also explicitly skip modules using skip_modules. Let's say you want all
  and standard-dep modules except domain:
  and standard-dep modules except domain:
 make group_include="standard standard-dep" skip_modules="domain" all
 make group_include="standard standard-dep" skip_modules="domain" all
 
 
-NOTE!!! As this mechanism is very powerful, you may be uncertain which modules wwill be included.
-Just replace all (or modules) with print-modules and you will see which modules will be included
-and excluded, ex:
+NOTE!!! As this mechanism is very powerful, you may be uncertain which
+modules wwill be included.
+Just replace all (or modules) with print-modules and you will see which
+modules will be included and excluded, ex:
+
 make print-modules
 make print-modules
+
 will show which modules are excluded by default.
 will show which modules are excluded by default.
 
 
-If you want to install or to build a binary package (a tar.gz with ser and
- the modules), substitute "all" in the above command with "install" or "bin".
+If you want to install or to build a binary package (a tar.gz with
+sip-router and the modules), substitute "all" in the above command with
+"install" or "bin".
 
 
 
 
 More compile examples:
 More compile examples:
@@ -421,22 +427,23 @@ make prefix=/usr/local  install
 
 
 Note: If you use prefix parameter in make install then you also need
 Note: If you use prefix parameter in make install then you also need
 to use this parameter in previous make commands, i.e. make, make modules,
 to use this parameter in previous make commands, i.e. make, make modules,
-or make all. If you fail to do this then SER will look for the default
+or make all. If you fail to do this then SIP Router will look for the default
 configuration file in a wrong directory, because the directory of the
 configuration file in a wrong directory, because the directory of the
-default configuration file is hard coded into ser during compile time. 
+default configuration file is hard coded into sip-router during compile time. 
 When you use a different prefix parameter when installing then the 
 When you use a different prefix parameter when installing then the 
-directory hard coded in ser and the directory in which the file will be 
+directory hard coded in sip-router and the directory in which the file will be 
 installed by make install will not match. (You can specify exact location
 installed by make install will not match. (You can specify exact location
-of the configuration file using -f parameter of ser).
+of the configuration file using -f parameter of sip-router).
 
 
 For example, if you do the following:
 For example, if you do the following:
 make all
 make all
 make prefix=/ install
 make prefix=/ install
 
 
 Then the installation will put the default configuration file into
 Then the installation will put the default configuration file into
-/etc/ser/ser.cfg (because prefix is /), but ser will look for the file
-in /usr/local/etc/ser/ser.cfg (because there was no prefix parameter
-in make all and /usr/local is the default value of prefix).
+/etc/sip-router/sip-router.cfg (because prefix is /), but sip-router
+will look for the file in /usr/local/etc/sip-router/sip-router.cfg
+(because there was no prefix parameter make all and /usr/local is the
+default value of prefix).
 
 
 Workaround is trivial, use the same parameters in all make commands:
 Workaround is trivial, use the same parameters in all make commands:
 make prefix=/ all
 make prefix=/ all
@@ -452,17 +459,18 @@ That applies to other make parameters as well (for example parameters
 
 
 A) Getting Help
 A) Getting Help
 
 
-This guide gives you instructions on how to set up the SIP Express 
-Router (ser) on your box quickly. In case the default configuration
-does not fly, check documentation at ser site
-  http://www.iptel.org/ser/
-to learn how to configure SER for your site.
+This guide gives you instructions on how to set up the SIP Router
+(sip-router) on your box quickly. In case the default configuration
+does not fly, check documentation at sip-router site
+  http://sip-router.org
+to learn how to configure SIP Router 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 [email protected] -- that is the mailing 
-list of ser community. To participate in the mailing list, subscribe at the 
-following web address:
-  http://lists.iptel.org/mailman/listinfo/serusers
+our user forum by E-mail at [email protected] -- that is the
+mailing list of ser community. To participate in the mailing list,
+subscribe at the following web address:
+
+  http://lists.sip-router.org/cgi-bin/mailman/listinfo
 
 
 To participate in our commercial support program, contact [email protected].
 To participate in our commercial support program, contact [email protected].
 The support program will provide you with most timely and accurate help
 The support program will provide you with most timely and accurate help
@@ -482,14 +490,19 @@ dependencies on MySQL which is needed for storing user credentials.)
 C) Quick Start
 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 ser. If you need persistence and authentication, 
-then you have to install additional MySql support -- proceed to section D)
-after you are finished with C).
-
-1) Download an RPM or debian package from our site
-    http://www.iptel.org/ser
-If you don't use an rpm or debian based distribution, try our tar.gz'ed binaries
- (ser-$(version)_$(os)_$(arch).tar.gz, e.g: ser-0.8.8_linux_i386.tar.gz).
+sql-free distribution of sip-router. If you need persistence and
+authentication, then you have to install additional MySql support --
+proceed to section D) after you are finished with C).
+
+1) Download an RPM or debian package from site
+
+    ****** site not available yet
+
+If you don't use an rpm or debian based distribution, try our tar.gz'ed
+binaries
+
+  ******* not available yet
+
 If you use Solaris 8 you can try our solaris package.
 If you use Solaris 8 you can try our solaris package.
 If you use Gentoo Linux you do not have to download a package.
 If you use Gentoo Linux you do not have to download a package.
 
 
@@ -499,13 +512,13 @@ RPM:
 debian:
 debian:
     dpkg -i <package_name>
     dpkg -i <package_name>
 gentoo:
 gentoo:
-    emerge ser
+    emerge sip-router
 	(or if use only stable packets:
 	(or if use only stable packets:
-	 ACCEPT_KEYWORDS="~x86" emerge ser)
+	 ACCEPT_KEYWORDS="~x86" emerge sip-router)
 tar.gz:
 tar.gz:
     cd /; tar zxvf <package_name>_os_arch.tar.gz
     cd /; tar zxvf <package_name>_os_arch.tar.gz
     (it will install in /usr/local/, and the configuration file in
     (it will install in /usr/local/, and the configuration file in
-     /usr/local/etc/ser/ser.cfg)
+     /usr/local/etc/sip-router/sip-router.cfg)
 Solaris:
 Solaris:
     gunzip <package_name>.gz ; pkgadd -d <package_name>
     gunzip <package_name>.gz ; pkgadd -d <package_name>
 *BSD:
 *BSD:
@@ -513,15 +526,15 @@ Solaris:
     
     
 3) start the server
 3) start the server
 RPM + gentoo:
 RPM + gentoo:
-    /etc/init.d/ser start
+    /etc/init.d/sip-router start
 debian:
 debian:
-    ser is started automatically after the install
-    (in case something fails you can start it with /etc/init.d/ser start)
+    sip-router is started automatically after the install
+    (in case something fails you can start it with /etc/init.d/sip-router start)
 tar.gz:
 tar.gz:
     the tar.gz does not include an init.d script, you'll have to create one of
     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 (debian/init.d,
     your own or adapt one from the source distribution (debian/init.d,
-    rpm/ser.init.*, gentoo/ser.init)
-    You can start ser directly with /usr/local/sbin/ser.
+    rpm/sip-router.init.*, gentoo/sip-router.init)
+    You can start sip-router directly with /usr/local/sbin/sip-router.
 Solaris:
 Solaris:
     see tar.gz.
     see tar.gz.
     
     
@@ -552,20 +565,23 @@ Solaris:
 
 
 
 
 
 
-D) ser with Persistent Data Storage
+D) sip-router with Persistent Data Storage
 
 
 The default configuration is very simple and features many simplifications. 
 The default configuration is very simple and features many simplifications. 
 In particular, it does not authenticate users and loses User Location database 
 In particular, it does not authenticate users and loses User Location database 
 on reboot. To provide persistence, keep user credentials and remember users' 
 on reboot. To provide persistence, keep user credentials and remember users' 
-locations across reboots, ser can be configured to use 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 connection. To increase it, set the 
-following line in [mysqld] section of your configuration file:
+locations across reboots, ser can be configured to use 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
+connection. To increase it, set the following line in [mysqld] section
+of your configuration file:
 
 
    set-variable    = max_connections=500
    set-variable    = max_connections=500
 
 
-1) Download the package containing mysql support for ser from: 
-    http://www.iptel.org/ser/
+1) Download the package containing mysql support for sip-router from: 
+    
+    **** site not available yet
+
     (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
      solaris package include it; if it is not present you'll have to rebuild
      from the source).
      from the source).
@@ -576,23 +592,23 @@ following line in [mysqld] section of your configuration file:
     or
     or
     dpkg -i <package_name>
     dpkg -i <package_name>
 	or
 	or
-	emerge ser
+	emerge sip-router
 	(if do not want to put 'mysql' into your USE variable you can type:
 	(if do not want to put 'mysql' into your USE variable you can type:
-	 USE="mysql" emerge ser)
+	 USE="mysql" emerge sip-router)
 3) create MySQL tables
 3) create MySQL tables
-	- if you have a previously installed SER on your system, use
-    	/usr/sbin/ser_mysql.sh reinstall 
-	  to convert your SER database into new structures
+	- if you have a previously installed SIP Router on your system, use
+    	/usr/sbin/sip-router_mysql.sh reinstall 
+	  to convert your SIP Router database into new structures
 	- otherwise, if this is your very first installation, use
 	- otherwise, if this is your very first installation, use
-    	/usr/sbin/ser_mysql.sh create
-	  to create SER database structures
+    	/usr/sbin/sip-router_mysql.sh create
+	  to create SIP Router database structures
    (you will be prompted for password of MySql "root" user)
    (you will be prompted for password of MySql "root" user)
-4) configure ser to use SQL
-    uncomment all lines in configuration file ser.cfg which are related to 
+4) configure sip-router to use SQL
+    uncomment all lines in configuration file sip-router.cfg which are related to 
     authentication:
     authentication:
-    - loadmodule "/usr/lib/ser/modules/mysql.so"
-    - loadmodule "/usr/lib/ser/modules/auth.so"
-    - loadmodule "/usr/lib/ser/modules/auth_db.so"
+    - loadmodule "/usr/lib/sip-router/modules/mysql.so"
+    - loadmodule "/usr/lib/sip-router/modules/auth.so"
+    - loadmodule "/usr/lib/sip-router/modules/auth_db.so"
     - modparam("usrloc", "db_mode", 2)
     - modparam("usrloc", "db_mode", 2)
     - modparam("auth", "calculate_ha1", yes)
     - modparam("auth", "calculate_ha1", yes)
     - modparam("auth_db", "password_column", "password")
     - modparam("auth_db", "password_column", "password")
@@ -609,7 +625,7 @@ following line in [mysqld] section of your configuration file:
         break;
         break;
       }
       }
 6) restart the server
 6) restart the server
-    /etc/init.d/ser restart
+    /etc/init.d/sip-router restart
 7) you can now start  managing the server using the serctl utility; 
 7) you can now start  managing the server using the serctl utility; 
    you need to first set the environment variable SIP_DOMAIN to your 
    you need to first set the environment variable SIP_DOMAIN to your 
    local SIP realm, e.g.,
    local SIP realm, e.g.,
@@ -633,17 +649,19 @@ challenged request at all and pops up authentication window again. If you
 want to authenticate WM, you need to set up your realm value to equal server 
 want to authenticate WM, you need to set up your realm value to equal server 
 name. If your server has no name, IP address can be used as realm too.
 name. If your server has no name, IP address can be used as realm too.
 
 
-Q: SIP requests are replied by ser with "483 Too Many Hops" or 
+Q: SIP requests are replied by sip-router with "483 Too Many Hops" or 
    "513 Message Too Large"
    "513 Message Too Large"
 
 
 A: In both cases, the reason is probably an error in request routing script 
 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 
    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 current URI in believe it 
-   would forward them to a foreign domain. Alas, it forwards the request to itself 
-   again. This continues to happen until value of max_forwards header field reaches 
-   zero or the request grows too big. Solutions is easy: make sure that domain matching 
-   is correctly configured. A quick way to achieve that is to introduce a config
-   option to ser.cfg: alias=domainname, where domainname shall be replaced with
-   name of domain, which you wish to server and which appears in request-URIs.
+   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
+   current URI in believe it would forward them to a foreign
+   domain. Alas, it forwards the request to itself again. This continues
+   to happen until value of max_forwards header field reaches zero or
+   the request grows too big. Solutions is easy: make sure that domain
+   matching is correctly configured. A quick way to achieve that is to
+   introduce a config option to sip-router.cfg: alias=domainname, where
+   domainname shall be replaced with name of domain, which you wish to
+   server and which appears in request-URIs.

+ 53 - 53
Makefile

@@ -89,8 +89,8 @@ include Makefile.targets
 #  an utility fails
 #  an utility fails
 err_fail?=1
 err_fail?=1
 
 
-# whether or not to install ser.cfg or just ser.cfg.default
-# (ser.cfg will never be overwritten by make install, this is usefull
+# whether or not to install sip-router.cfg or just sip-router.cfg.default
+# (sip-router.cfg will never be overwritten by make install, this is usefull
 #  when creating packages)
 #  when creating packages)
 skip_cfg_install?=
 skip_cfg_install?=
 
 
@@ -338,7 +338,7 @@ utils_bin_install=	utils/gen_ha1/gen_ha1 utils/sercmd/sercmd
 utils_script_install=
 utils_script_install=
 
 
 # This is the list of files to be installed into the arch-independent
 # This is the list of files to be installed into the arch-independent
-# shared directory (by default /usr/local/share/ser)
+# shared directory (by default /usr/local/share/sip-router)
 share_install= scripts/mysql/my_create.sql \
 share_install= scripts/mysql/my_create.sql \
 			   scripts/mysql/my_data.sql   \
 			   scripts/mysql/my_data.sql   \
 			   scripts/mysql/my_drop.sql
 			   scripts/mysql/my_drop.sql
@@ -613,7 +613,7 @@ utils:
 	done; true
 	done; true
 
 
 
 
-dbg: ser
+dbg: sip-router
 	gdb -command debug.gdb
 	gdb -command debug.gdb
 
 
 .PHONY: tar
 .PHONY: tar
@@ -625,9 +625,9 @@ tar:
 	$(TAR) -C .. \
 	$(TAR) -C .. \
 		--exclude=$(notdir $(CURDIR))/test* \
 		--exclude=$(notdir $(CURDIR))/test* \
 		--exclude=$(notdir $(CURDIR))/tmp* \
 		--exclude=$(notdir $(CURDIR))/tmp* \
-		--exclude=$(notdir $(CURDIR))/debian/ser \
-		--exclude=$(notdir $(CURDIR))/debian/ser-* \
-		--exclude=$(notdir $(CURDIR))/ser_tls* \
+		--exclude=$(notdir $(CURDIR))/debian/sip-router \
+		--exclude=$(notdir $(CURDIR))/debian/sip-router-* \
+		--exclude=$(notdir $(CURDIR))/sip-router_tls* \
 		--exclude=CVS* \
 		--exclude=CVS* \
 		--exclude=.svn* \
 		--exclude=.svn* \
 		--exclude=.cvsignore \
 		--exclude=.cvsignore \
@@ -639,7 +639,7 @@ tar:
 		--exclude=*.[do] \
 		--exclude=*.[do] \
 		--exclude=*.so \
 		--exclude=*.so \
 		--exclude=*.il \
 		--exclude=*.il \
-		--exclude=$(notdir $(CURDIR))/ser \
+		--exclude=$(notdir $(CURDIR))/sip-router \
 		--exclude=*.gz \
 		--exclude=*.gz \
 		--exclude=*.bz2 \
 		--exclude=*.bz2 \
 		--exclude=*.tar \
 		--exclude=*.tar \
@@ -660,10 +660,10 @@ tar:
 # binary dist. tar.gz
 # binary dist. tar.gz
 .PHONY: bin
 .PHONY: bin
 bin:
 bin:
-	mkdir -p tmp/ser/usr/local
-	$(MAKE) install basedir=tmp/ser $(mk_params)
-	$(TAR) -C tmp/ser/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
-	rm -rf tmp/ser
+	mkdir -p tmp/sip-router/usr/local
+	$(MAKE) install basedir=tmp/sip-router $(mk_params)
+	$(TAR) -C tmp/sip-router/ -zcf ../$(NAME)-$(RELEASE)_$(OS)_$(ARCH).tar.gz .
+	rm -rf tmp/sip-router
 
 
 .PHONY: deb
 .PHONY: deb
 deb:
 deb:
@@ -677,18 +677,18 @@ deb:
 
 
 .PHONY: sunpkg
 .PHONY: sunpkg
 sunpkg:
 sunpkg:
-	mkdir -p tmp/ser
-	mkdir -p tmp/ser_sun_pkg
-	$(MAKE) install basedir=tmp/ser prefix=/usr/local $(mk_params)
+	mkdir -p tmp/sip-router
+	mkdir -p tmp/sip-router_sun_pkg
+	$(MAKE) install basedir=tmp/sip-router prefix=/usr/local $(mk_params)
 	(cd pkg/solaris; \
 	(cd pkg/solaris; \
-	pkgmk -r ../../tmp/ser/usr/local -o -d ../../tmp/ser_sun_pkg/ -v "$(RELEASE)" ;\
+	pkgmk -r ../../tmp/sip-router/usr/local -o -d ../../tmp/sip-router_sun_pkg/ -v "$(RELEASE)" ;\
 	cd ../..)
 	cd ../..)
 	cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
 	cat /dev/null > ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
-	pkgtrans -s tmp/ser_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
-		IPTELser
+	pkgtrans -s tmp/sip-router_sun_pkg/ ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local \
+		IPTELsip-router
 	gzip -9 ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
 	gzip -9 ../$(NAME)-$(RELEASE)-$(OS)-$(ARCH)-local
-	rm -rf tmp/ser
-	rm -rf tmp/ser_sun_pkg
+	rm -rf tmp/sip-router
+	rm -rf tmp/sip-router_sun_pkg
 
 
 
 
 .PHONY: install
 .PHONY: install
@@ -698,8 +698,8 @@ install: install-bin install-every-module install-cfg \
 
 
 .PHONY: dbinstall
 .PHONY: dbinstall
 dbinstall:
 dbinstall:
-	-@echo "Initializing ser database"
-	scripts/mysql/ser_mysql.sh create
+	-@echo "Initializing sip-router database"
+	scripts/mysql/sip-router_mysql.sh create
 	-@echo "Done"
 	-@echo "Done"
 
 
 .PHONY: README
 .PHONY: README
@@ -743,32 +743,32 @@ $(man_prefix)/$(man_dir)/man5:
 # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) 
 # note: sed with POSIX.1 regex doesn't support |, + or ? (darwin, solaris ...) 
 install-cfg: $(cfg_prefix)/$(cfg_dir)
 install-cfg: $(cfg_prefix)/$(cfg_dir)
 		sed $(foreach m,$(modules_dirs),\
 		sed $(foreach m,$(modules_dirs),\
-				-e "s#/usr/[^:]*lib/ser/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
-			< etc/ser-basic.cfg > $(cfg_prefix)/$(cfg_dir)ser.cfg.sample
-		chmod 644 $(cfg_prefix)/$(cfg_dir)ser.cfg.sample
+				-e "s#/usr/[^:]*lib/sip-router/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
+			< etc/sip-router-basic.cfg > $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample
+		chmod 644 $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample
 		if [ -z "${skip_cfg_install}" -a \
 		if [ -z "${skip_cfg_install}" -a \
-				! -f $(cfg_prefix)/$(cfg_dir)ser.cfg ]; then \
-			mv -f $(cfg_prefix)/$(cfg_dir)ser.cfg.sample \
-				$(cfg_prefix)/$(cfg_dir)ser.cfg; \
+				! -f $(cfg_prefix)/$(cfg_dir)sip-router.cfg ]; then \
+			mv -f $(cfg_prefix)/$(cfg_dir)sip-router.cfg.sample \
+				$(cfg_prefix)/$(cfg_dir)sip-router.cfg; \
 		fi
 		fi
 		sed $(foreach m,$(modules_dirs),\
 		sed $(foreach m,$(modules_dirs),\
-			-e "s#/usr/[^:]*lib/ser/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
-			< etc/ser-oob.cfg \
-			> $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg.sample
-		chmod 644 $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg.sample
+			-e "s#/usr/[^:]*lib/sip-router/$(m)\([:/\"]\)#$($(m)_target)\1#g") \
+			< etc/sip-router-oob.cfg \
+			> $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample
+		chmod 644 $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample
 		if [ -z "${skip_cfg_install}" -a \
 		if [ -z "${skip_cfg_install}" -a \
-				! -f $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg ]; then \
-			mv -f $(cfg_prefix)/$(cfg_dir)ser-advanced.cfg.sample \
-				$(cfg_prefix)/$(cfg_dir)ser-advanced.cfg; \
+				! -f $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg ]; then \
+			mv -f $(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg.sample \
+				$(cfg_prefix)/$(cfg_dir)sip-router-advanced.cfg; \
 		fi
 		fi
 		# radius dictionary
 		# radius dictionary
-		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.ser
-		$(INSTALL_CFG) etc/dictionary.ser $(cfg_prefix)/$(cfg_dir)
+		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.sip-router
+		$(INSTALL_CFG) etc/dictionary.sip-router $(cfg_prefix)/$(cfg_dir)
 
 
 		# TLS configuration
 		# TLS configuration
 		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg
 		$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg
 		$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir)
 		$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir)
-		modules/tls/ser_cert.sh -d $(cfg_prefix)/$(cfg_dir)
+		modules/tls/sip-router_cert.sh -d $(cfg_prefix)/$(cfg_dir)
 
 
 install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
 install-bin: $(bin_prefix)/$(bin_dir) $(NAME)
 		$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
 		$(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME)
@@ -833,8 +833,8 @@ install-utils: utils $(bin_prefix)/$(bin_dir)
 	# FIXME: This is a hack, this should be (and will be) done properly in
 	# FIXME: This is a hack, this should be (and will be) done properly in
     # per-module Makefiles
     # per-module Makefiles
 	sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \
 	sed -e "s#^DEFAULT_SCRIPT_DIR.*#DEFAULT_SCRIPT_DIR=\"$(share_prefix)/$(share_dir)\"#g" \
-		< scripts/mysql/ser_mysql.sh > $(bin_prefix)/$(bin_dir)/ser_mysql.sh
-	chmod 755 $(bin_prefix)/$(bin_dir)/ser_mysql.sh
+		< scripts/mysql/sip-router_mysql.sh > $(bin_prefix)/$(bin_dir)/sip-router_mysql.sh
+	chmod 755 $(bin_prefix)/$(bin_dir)/sip-router_mysql.sh
 
 
 
 
 install-modules-all: install-every-module install-every-module-doc
 install-modules-all: install-every-module install-every-module-doc
@@ -853,23 +853,23 @@ install-doc: $(doc_prefix)/$(doc_dir) install-every-module-doc
 	$(INSTALL_DOC) README $(doc_prefix)/$(doc_dir)
 	$(INSTALL_DOC) README $(doc_prefix)/$(doc_dir)
 
 
 
 
-install-ser-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
-		sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \
+install-sip-router-man: $(man_prefix)/$(man_dir)/man8 $(man_prefix)/$(man_dir)/man5
+		sed -e "s#/etc/sip-router/sip-router\.cfg#$(cfg_target)sip-router.cfg#g" \
 			-e "s#/usr/sbin/#$(bin_target)#g" \
 			-e "s#/usr/sbin/#$(bin_target)#g" \
 			$(foreach m,$(modules_dirs),\
 			$(foreach m,$(modules_dirs),\
-				-e "s#/usr/lib/ser/$(m)\([^_]\)#$($(m)_target)\1#g") \
-			-e "s#/usr/share/doc/ser/#$(doc_target)#g" \
-			< ser.8 >  $(man_prefix)/$(man_dir)/man8/ser.8
-		chmod 644  $(man_prefix)/$(man_dir)/man8/ser.8
-		sed -e "s#/etc/ser/ser\.cfg#$(cfg_target)ser.cfg#g" \
+				-e "s#/usr/lib/sip-router/$(m)\([^_]\)#$($(m)_target)\1#g") \
+			-e "s#/usr/share/doc/sip-router/#$(doc_target)#g" \
+			< sip-router.8 >  $(man_prefix)/$(man_dir)/man8/sip-router.8
+		chmod 644  $(man_prefix)/$(man_dir)/man8/sip-router.8
+		sed -e "s#/etc/sip-router/sip-router\.cfg#$(cfg_target)sip-router.cfg#g" \
 			-e "s#/usr/sbin/#$(bin_target)#g" \
 			-e "s#/usr/sbin/#$(bin_target)#g" \
 			$(foreach m,$(modules_dirs),\
 			$(foreach m,$(modules_dirs),\
-				-e "s#/usr/lib/ser/$(m)\([^_]\)#$($(m)_target)\1#g") \
-			-e "s#/usr/share/doc/ser/#$(doc_target)#g" \
-			< ser.cfg.5 >  $(man_prefix)/$(man_dir)/man5/ser.cfg.5
-		chmod 644  $(man_prefix)/$(man_dir)/man5/ser.cfg.5
+				-e "s#/usr/lib/sip-router/$(m)\([^_]\)#$($(m)_target)\1#g") \
+			-e "s#/usr/share/doc/sip-router/#$(doc_target)#g" \
+			< sip-router.cfg.5 >  $(man_prefix)/$(man_dir)/man5/sip-router.cfg.5
+		chmod 644  $(man_prefix)/$(man_dir)/man5/sip-router.cfg.5
 
 
-install-man:  install-ser-man install-every-module-man
+install-man:  install-sip-router-man install-every-module-man
 
 
 
 
 
 
@@ -887,7 +887,7 @@ proper-libs realclean-libs distclean-libs maintainer-clean-libs:
 clean: clean-modules
 clean: clean-modules
 # clean utils on make clean
 # clean utils on make clean
 clean: clean-utils
 clean: clean-utils
-# cleaning in libs always when cleaning ser
+# cleaning in libs always when cleaning sip-router
 clean: clean-libs
 clean: clean-libs
 
 
 # proper/distclean a.s.o modules, utils and libs too
 # proper/distclean a.s.o modules, utils and libs too

+ 1 - 1
Makefile.defs

@@ -100,7 +100,7 @@ export makefile_defs
 
 
 $(info normal Makefile.defs exec)
 $(info normal Makefile.defs exec)
 # main binary name
 # main binary name
-MAIN_NAME=ser
+MAIN_NAME=sip-router
 
 
 #version number
 #version number
 VERSION = 2
 VERSION = 2

+ 1 - 1
config.h

@@ -44,7 +44,7 @@
 #define SIP_PORT  5060
 #define SIP_PORT  5060
 #define SIPS_PORT 5061
 #define SIPS_PORT 5061
 
 
-#define CFG_FILE CFG_DIR "ser.cfg"
+#define CFG_FILE CFG_DIR "sip-router.cfg"
 
 
 #define TLS_PKEY_FILE "cert.pem" 
 #define TLS_PKEY_FILE "cert.pem" 
 #define TLS_CERT_FILE "cert.pem"
 #define TLS_CERT_FILE "cert.pem"

+ 3 - 3
etc/dbtext.cfg

@@ -21,7 +21,7 @@ dns=no           # (cmd. line: -r)
 rev_dns=no      # (cmd. line: -R)
 rev_dns=no      # (cmd. line: -R)
 port=5060
 port=5060
 children=4
 children=4
-fifo="/tmp/ser_fifo"
+fifo="/tmp/sip-router_fifo"
 
 
 # ------------------ module loading ----------------------------------
 # ------------------ module loading ----------------------------------
 
 
@@ -49,8 +49,8 @@ loadmodule "./modules/auth_db/auth_db.so"
 # Uncomment this if you want to use SQL database 
 # Uncomment this if you want to use SQL database 
 # for persistent storage and comment the previous line
 # for persistent storage and comment the previous line
 modparam("usrloc", "db_mode", 1)
 modparam("usrloc", "db_mode", 1)
-modparam("usrloc", "db_url", "/home/janakj/ser")
-modparam("auth_db", "db_url", "/home/janakj/ser")
+modparam("usrloc", "db_url", "/home/janakj/sip-router")
+modparam("auth_db", "db_url", "/home/janakj/sip-router")
 
 
 # -- auth params --
 # -- auth params --
 # Uncomment if you are using auth module
 # Uncomment if you are using auth module

+ 0 - 0
etc/dictionary.ser → etc/dictionary.sip-router


+ 12 - 12
etc/nathelper.cfg

@@ -33,28 +33,28 @@ dns=no           # (cmd. line: -r)
 rev_dns=no      # (cmd. line: -R)
 rev_dns=no      # (cmd. line: -R)
 port=5060
 port=5060
 children=4
 children=4
-fifo="/tmp/ser_fifo"
+fifo="/tmp/sip-router_fifo"
 
 
 # ------------------ module loading ----------------------------------
 # ------------------ module loading ----------------------------------
 
 
 # Uncomment this if you want to use SQL database
 # Uncomment this if you want to use SQL database
-#loadmodule "/usr/local/lib/ser/modules/mysql.so"
+#loadmodule "/usr/local/lib/sip-router/modules/mysql.so"
 
 
-loadmodule "/usr/local/lib/ser/modules/sl.so"
-loadmodule "/usr/local/lib/ser/modules/tm.so"
-loadmodule "/usr/local/lib/ser/modules/rr.so"
-loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
-loadmodule "/usr/local/lib/ser/modules/usrloc.so"
-loadmodule "/usr/local/lib/ser/modules/registrar.so"
-loadmodule "/usr/local/lib/ser/modules/textops.so"
+loadmodule "/usr/local/lib/sip-router/modules/sl.so"
+loadmodule "/usr/local/lib/sip-router/modules/tm.so"
+loadmodule "/usr/local/lib/sip-router/modules/rr.so"
+loadmodule "/usr/local/lib/sip-router/modules/maxfwd.so"
+loadmodule "/usr/local/lib/sip-router/modules/usrloc.so"
+loadmodule "/usr/local/lib/sip-router/modules/registrar.so"
+loadmodule "/usr/local/lib/sip-router/modules/textops.so"
 
 
 # Uncomment this if you want digest authentication
 # Uncomment this if you want digest authentication
 # mysql.so must be loaded !
 # mysql.so must be loaded !
-#loadmodule "/usr/local/lib/ser/modules/auth.so"
-#loadmodule "/usr/local/lib/ser/modules/auth_db.so"
+#loadmodule "/usr/local/lib/sip-router/modules/auth.so"
+#loadmodule "/usr/local/lib/sip-router/modules/auth_db.so"
 
 
 # !! Nathelper
 # !! Nathelper
-loadmodule "/usr/local/lib/ser/modules/nathelper.so"
+loadmodule "/usr/local/lib/sip-router/modules/nathelper.so"
 
 
 # ----------------- setting module-specific parameters ---------------
 # ----------------- setting module-specific parameters ---------------
 
 

+ 1 - 1
etc/rules.m4

@@ -3,7 +3,7 @@
 #
 #
 # (c) 2003 iptel.org
 # (c) 2003 iptel.org
 #
 #
-# Rules to process ser.cfg templates
+# Rules to process sip-router.cfg templates
 #
 #
 
 
 #id generator, usage: gen_id(`name'))
 #id generator, usage: gen_id(`name'))

+ 7 - 7
etc/ser-basic.cfg → etc/sip-router-basic.cfg

@@ -3,7 +3,7 @@
 #
 #
 # This a very basic config file w aliases and anamed route but
 # This a very basic config file w aliases and anamed route but
 # w/o authentication, accounting, database, multi-domain support etc.
 # w/o authentication, accounting, database, multi-domain support etc.
-# Please refer to ser.cfg for a more complete example
+# Please refer to sip-router.cfg for a more complete example
 #
 #
 
 
 # ----------- global configuration parameters ------------------------
 # ----------- global configuration parameters ------------------------
@@ -23,8 +23,8 @@ dns=no          # (cmd. line: -r)
 rev_dns=no      # (cmd. line: -R)
 rev_dns=no      # (cmd. line: -R)
 #port=5060
 #port=5060
 #children=4
 #children=4
-#user=ser
-#group=ser
+#user=sip-router
+#group=sip-router
 #disable_core=yes #disables core dumping
 #disable_core=yes #disables core dumping
 #open_fd_limit=1024 # sets the open file descriptors limit
 #open_fd_limit=1024 # sets the open file descriptors limit
 #mhomed=yes  # usefull for multihomed hosts, small performance penalty
 #mhomed=yes  # usefull for multihomed hosts, small performance penalty
@@ -36,7 +36,7 @@ rev_dns=no      # (cmd. line: -R)
 # ------------------ module loading ----------------------------------
 # ------------------ module loading ----------------------------------
 
 
 #loadpath "modules:modules_s"
 #loadpath "modules:modules_s"
-loadpath "/usr/lib/ser/modules:/usr/lib/ser/modules_s"
+loadpath "/usr/lib/sip-router/modules:/usr/lib/sip-router/modules_s"
 
 
 loadmodule "sl"
 loadmodule "sl"
 loadmodule "tm"
 loadmodule "tm"
@@ -59,11 +59,11 @@ modparam("usrloc", "db_mode",   0)
 modparam("rr", "enable_full_lr", 1)
 modparam("rr", "enable_full_lr", 1)
 
 
 # ctl params
 # ctl params
-# by default ctl listens on unixs:/tmp/ser_ctl if no other address is
+# by default ctl listens on unixs:/tmp/sip-router_ctl if no other address is
 # specified in modparams; this is also the default for sercmd
 # specified in modparams; this is also the default for sercmd
-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
+modparam("ctl", "binrpc", "unixs:/tmp/sip-router_ctl")
 # listen on the "standard" fifo for backward compatibility
 # listen on the "standard" fifo for backward compatibility
-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
+modparam("ctl", "fifo", "fifo:/tmp/sip-router_fifo")
 # listen on tcp, localhost
 # listen on tcp, localhost
 #modparam("ctl", "binrpc", "tcp:localhost:2046")
 #modparam("ctl", "binrpc", "tcp:localhost:2046")
 
 

+ 13 - 13
etc/ser-oob.cfg → etc/sip-router-oob.cfg

@@ -16,7 +16,7 @@
 # multicast).
 # multicast).
 #
 #
 # If you look for a simpler version with a lot less dependencies
 # If you look for a simpler version with a lot less dependencies
-# please refer to the ser-basic.cfg file in your SER distribution.
+# please refer to the sip-router-basic.cfg file in your SER distribution.
 #
 #
 # Requirements:
 # Requirements:
 # ---------------
 # ---------------
@@ -59,7 +59,7 @@
 # script, according to values entered by user at installation time in
 # script, according to values entered by user at installation time in
 # debconf configuration. These values are then applied automatically to
 # debconf configuration. These values are then applied automatically to
 # this file each time the 'ser-oob' package is upgraded or reconfigured by
 # this file each time the 'ser-oob' package is upgraded or reconfigured by
-# calling 'dpkg-reconfigure ser-oob'.
+# calling 'dpkg-reconfigure sip-router-oob'.
 #
 #
 # The parts of this configuration file that may be altered by debconf are
 # The parts of this configuration file that may be altered by debconf are
 # enclosed between '#DEBCONF-something-START' and '#DEBCONF-something-END'
 # enclosed between '#DEBCONF-something-START' and '#DEBCONF-something-END'
@@ -133,7 +133,7 @@ server_id=0
 #DEBCONF-SERVERID-END
 #DEBCONF-SERVERID-END
 
 
 # Uncomment these lines to enter debugging mode or start SER with
 # Uncomment these lines to enter debugging mode or start SER with
-# ser -ED
+# sip-router -ED
 #
 #
 #fork=no
 #fork=no
 #log_stderror=yes
 #log_stderror=yes
@@ -143,8 +143,8 @@ dns=no                  # (cmd. line: -r)
 rev_dns=no              # (cmd. line: -R)
 rev_dns=no              # (cmd. line: -R)
 #port=5060
 #port=5060
 #children=4
 #children=4
-#user=ser
-#group=ser
+#user=sip-router
+#group=sip-router
 #disable_core=yes       # disables core dumping
 #disable_core=yes       # disables core dumping
 open_files_limit=20480  # sets the open file descriptors limit
 open_files_limit=20480  # sets the open file descriptors limit
 #mhomed=yes             # usefull for multihomed hosts, small performance
 #mhomed=yes             # usefull for multihomed hosts, small performance
@@ -195,7 +195,7 @@ dns_cache_min_ttl=60
 dns_cache_max_ttl=86400 # 1 day
 dns_cache_max_ttl=86400 # 1 day
 dns_cache_mem=2048 # 2 MB
 dns_cache_mem=2048 # 2 MB
 dns_cache_gc_interval=60  # garbage collection every minute
 dns_cache_gc_interval=60  # garbage collection every minute
-# ser 2.1 specific options
+# sip-router 2.1 specific options
 # dns_try_naptr=yes
 # dns_try_naptr=yes
 # dns_srv_lb=yes  # srv based load balancing
 # dns_srv_lb=yes  # srv based load balancing
 # dns_udp_pref=3  # prefer udp (when resolving naptr record)
 # dns_udp_pref=3  # prefer udp (when resolving naptr record)
@@ -210,7 +210,7 @@ use_dst_blacklist=on
 dst_blacklist_mem=1024 # 1 MB
 dst_blacklist_mem=1024 # 1 MB
 dst_blacklist_expire=300  # blacklist default time
 dst_blacklist_expire=300  # blacklist default time
 dst_blacklist_gc_interval=150 # 2.5 min
 dst_blacklist_gc_interval=150 # 2.5 min
-# for ser 2.1 to the above add tm blst_503* parameters and/or use the
+# for sip-router 2.1 to the above add tm blst_503* parameters and/or use the
 # blst module (see NEWS)
 # blst module (see NEWS)
 
 
 # ------------------- TCP Parameters ----------------------------------------
 # ------------------- TCP Parameters ----------------------------------------
@@ -255,7 +255,7 @@ rtp_proxy.enabled = "detect" desc "indicates whether the RTP Proxy is enabled or
 # ------------------ Module Loading -----------------------------------------
 # ------------------ Module Loading -----------------------------------------
 
 
 #loadpath "modules:modules_s"
 #loadpath "modules:modules_s"
-loadpath "/usr/lib/ser/modules:/usr/lib/ser/modules_s"
+loadpath "/usr/lib/sip-router/modules:/usr/lib/sip-router/modules_s"
 
 
 # load a SQL database for authentication, domains, user AVPs etc.
 # load a SQL database for authentication, domains, user AVPs etc.
 loadmodule "db_mysql"
 loadmodule "db_mysql"
@@ -316,12 +316,12 @@ avpflags
 #
 #
 #DEBCONF-DBURL-START
 #DEBCONF-DBURL-START
 modparam("speeddial|auth_db|usrloc|domain|uri_db|gflags|avp_db|db_ops",
 modparam("speeddial|auth_db|usrloc|domain|uri_db|gflags|avp_db|db_ops",
-         "db_url", "mysql://ser:[email protected]/ser")
+         "db_url", "mysql://sip-router:[email protected]/sip-router")
 #DEBCONF-DBURL-END
 #DEBCONF-DBURL-END
 
 
 # specify the path to your database for accounting
 # specify the path to your database for accounting
 #DEBCONF-DBURLACC-START
 #DEBCONF-DBURLACC-START
-modparam("acc_db", "db_url", "mysql://ser:[email protected]/ser")
+modparam("acc_db", "db_url", "mysql://sip-router:[email protected]/sip-router")
 #DEBCONF-DBURLACC-END
 #DEBCONF-DBURLACC-END
 
 
 
 
@@ -429,11 +429,11 @@ modparam("domain", "load_domain_attrs", 1)
 
 
 # -- ctl --
 # -- ctl --
 
 
-# By default, ctl listens on unixs:/tmp/ser_ctl if no other address is
+# By default, ctl listens on unixs:/tmp/sip-router_ctl if no other address is
 # specified in modparams; this is also the default for sercmd.
 # specified in modparams; this is also the default for sercmd.
-modparam("ctl", "binrpc", "unixs:/tmp/ser_ctl")
+modparam("ctl", "binrpc", "unixs:/tmp/sip-router_ctl")
 # Listen on the "standard" fifo for backward compatibility.
 # Listen on the "standard" fifo for backward compatibility.
-modparam("ctl", "fifo", "fifo:/tmp/ser_fifo")
+modparam("ctl", "fifo", "fifo:/tmp/sip-router_fifo")
 # Listen on tcp on localhost.
 # Listen on tcp on localhost.
 #modparam("ctl", "binrpc", "tcp:localhost:2046")
 #modparam("ctl", "binrpc", "tcp:localhost:2046")
 
 

+ 0 - 0
etc/ser.cfg → etc/sip-router.cfg


+ 23 - 23
etc/ser.cfg.m4 → etc/sip-router.cfg.m4

@@ -18,7 +18,7 @@ declare(failure, PSTN_FAILURE, _1_FAILURE)
 #
 #
 # $Id$
 # $Id$
 #
 #
-# ser.cfg m4 template
+# sip-router.cfg m4 template
 #
 #
 
 
 #
 #
@@ -30,14 +30,14 @@ declare(failure, PSTN_FAILURE, _1_FAILURE)
 fork=yes
 fork=yes
 port=5060
 port=5060
 log_stderror=no
 log_stderror=no
-fifo="/tmp/ser_fifo"
+fifo="/tmp/sip-router_fifo"
 
 
 # uncomment to enter testing mode
 # uncomment to enter testing mode
 /*
 /*
 fork=no
 fork=no
 port=5064
 port=5064
 log_stderror=yes
 log_stderror=yes
-fifo="/tmp/ser_fifox"
+fifo="/tmp/sip-router_fifox"
  */
  */
 
 
 debug=3
 debug=3
@@ -54,26 +54,26 @@ children=16
 # decimal value in there, e.g. dec(rw|rw|rw)=dec(666)=438
 # decimal value in there, e.g. dec(rw|rw|rw)=dec(666)=438
 fifo_mode=0666
 fifo_mode=0666
 
 
-loadmodule "/usr/local/lib/ser/modules/tm.so"
-loadmodule "/usr/local/lib/ser/modules/sl.so"
-loadmodule "/usr/local/lib/ser/modules/acc.so"
-loadmodule "/usr/local/lib/ser/modules/rr.so"
-loadmodule "/usr/local/lib/ser/modules/maxfwd.so"
-loadmodule "/usr/local/lib/ser/modules/mysql.so"
-loadmodule "/usr/local/lib/ser/modules/usrloc.so"
-loadmodule "/usr/local/lib/ser/modules/registrar.so"
-loadmodule "/usr/local/lib/ser/modules/auth.so"
-loadmodule "/usr/local/lib/ser/modules/auth_db.so"
-loadmodule "/usr/local/lib/ser/modules/textops.so"
-loadmodule "/usr/local/lib/ser/modules/uri.so"
-loadmodule "/usr/local/lib/ser/modules/group.so"
-loadmodule "/usr/local/lib/ser/modules/msilo.so"
-loadmodule "/usr/local/lib/ser/modules/nathelper.so"
-loadmodule "/usr/local/lib/ser/modules/enum.so"
-loadmodule "/usr/local/lib/ser/modules/domain.so"
-#loadmodule "/usr/local/lib/ser/modules/permissions.so"
-
-modparam("usrloc|acc|auth_db|group|msilo", "db_url", "sql://ser:heslo@localhost/ser")
+loadmodule "/usr/local/lib/sip-router/modules/tm.so"
+loadmodule "/usr/local/lib/sip-router/modules/sl.so"
+loadmodule "/usr/local/lib/sip-router/modules/acc.so"
+loadmodule "/usr/local/lib/sip-router/modules/rr.so"
+loadmodule "/usr/local/lib/sip-router/modules/maxfwd.so"
+loadmodule "/usr/local/lib/sip-router/modules/mysql.so"
+loadmodule "/usr/local/lib/sip-router/modules/usrloc.so"
+loadmodule "/usr/local/lib/sip-router/modules/registrar.so"
+loadmodule "/usr/local/lib/sip-router/modules/auth.so"
+loadmodule "/usr/local/lib/sip-router/modules/auth_db.so"
+loadmodule "/usr/local/lib/sip-router/modules/textops.so"
+loadmodule "/usr/local/lib/sip-router/modules/uri.so"
+loadmodule "/usr/local/lib/sip-router/modules/group.so"
+loadmodule "/usr/local/lib/sip-router/modules/msilo.so"
+loadmodule "/usr/local/lib/sip-router/modules/nathelper.so"
+loadmodule "/usr/local/lib/sip-router/modules/enum.so"
+loadmodule "/usr/local/lib/sip-router/modules/domain.so"
+#loadmodule "/usr/local/lib/sip-router/modules/permissions.so"
+
+modparam("usrloc|acc|auth_db|group|msilo", "db_url", "sql://sip-router:heslo@localhost/sip-router")
 
 
 # -- usrloc params --
 # -- usrloc params --
 /* 0 -- dont use mysql, 1 -- write_through, 2--write_back */
 /* 0 -- dont use mysql, 1 -- write_through, 2--write_back */

+ 17 - 17
etc/sr

@@ -10,19 +10,19 @@
 # chkconfig: 2345 20 80
 # chkconfig: 2345 20 80
 # description: controls execution of SIP router
 # description: controls execution of SIP router
 # processname: sr
 # processname: sr
-# config: /etc/ser/iptel.cfg
+# config: /etc/sip-router/iptel.cfg
 
 
 # Source function library.
 # Source function library.
 . /etc/rc.d/init.d/functions
 . /etc/rc.d/init.d/functions
 
 
-# we use a ser symlink -- that allows us to have a different name
-# in process table so that killalls does not start other sers
+# we use a sip-router symlink -- that allows us to have a different name
+# in process table so that killalls does not start other sip-routers
 # run from somewhere else
 # run from somewhere else
 
 
 BINNAME=sr
 BINNAME=sr
 HM=/home/srouter
 HM=/home/srouter
 SERDIR=$HM/sip_router
 SERDIR=$HM/sip_router
-ETC=/etc/ser/iptel.cfg
+ETC=/etc/sip-router/iptel.cfg
 PIDFILE=/var/run/sr.pid
 PIDFILE=/var/run/sr.pid
 [email protected]
 [email protected]
 USR=510
 USR=510
@@ -38,9 +38,9 @@ MYDIR=$HM/core
 CORE=$MYDIR/core
 CORE=$MYDIR/core
 TMP=/tmp/srcore.$$
 TMP=/tmp/srcore.$$
 
 
-ser_start() {
+sip-router_start() {
 	if [ -r $BIN -a -r $CORE ] ; then
 	if [ -r $BIN -a -r $CORE ] ; then
-		echo "before startup ser core found on `date` at $HOSTNAME" > $TMP
+		echo "before startup sip-router core found on `date` at $HOSTNAME" > $TMP
 		echo "----------------------------------" >> $TMP
 		echo "----------------------------------" >> $TMP
 		DATE=`date "+%Y-%m-%d--%H-%M"`
 		DATE=`date "+%Y-%m-%d--%H-%M"`
 		NEWCORE=$MYDIR/core.$DATE
 		NEWCORE=$MYDIR/core.$DATE
@@ -48,8 +48,8 @@ ser_start() {
 		echo core stored in $NEWCORE >> $TMP
 		echo core stored in $NEWCORE >> $TMP
 		gdb $BIN $NEWCORE -x test/bt.gdb -batch >> $TMP
 		gdb $BIN $NEWCORE -x test/bt.gdb -batch >> $TMP
 		chmod a+r $NEWCORE
 		chmod a+r $NEWCORE
-		cd $SERDIR; tar czf $MYDIR/ser.$DATE.tgz .
-		mail -s "ser core found" $NOTIFY < $TMP
+		cd $SERDIR; tar czf $MYDIR/sip-router.$DATE.tgz .
+		mail -s "sip-router core found" $NOTIFY < $TMP
 		rm -f $TMP
 		rm -f $TMP
 	fi
 	fi
 	cd $MYDIR
 	cd $MYDIR
@@ -60,7 +60,7 @@ ser_start() {
 	echo
 	echo
 }
 }
 
 
-ser_stop() {
+sip-router_stop() {
 	echo "Stopping SIP router: "
 	echo "Stopping SIP router: "
 	killproc $BINNAME
 	killproc $BINNAME
 	RETVAL=$?
 	RETVAL=$?
@@ -69,14 +69,14 @@ ser_stop() {
 
 
 monit_start() {
 monit_start() {
    echo "Command Monit to start Ser..."
    echo "Command Monit to start Ser..."
-   ${MONIT} -c ${MONITRC} start ser
+   ${MONIT} -c ${MONITRC} start sip-router
    RETVAL=$?
    RETVAL=$?
    echo
    echo
 }
 }
 
 
 monit_stop() {
 monit_stop() {
    echo "Command Monit to stop Ser..."
    echo "Command Monit to stop Ser..."
-   ${MONIT} -c ${MONITRC} stop ser
+   ${MONIT} -c ${MONITRC} stop sip-router
    RETVAL=$?
    RETVAL=$?
    echo
    echo
 }
 }
@@ -84,15 +84,15 @@ monit_stop() {
 # See how we were called.
 # See how we were called.
 case "$1" in
 case "$1" in
   serstart)
   serstart)
-	ser_start
+	sip-router_start
 	;;
 	;;
-  serstop)
-    ser_stop
+  sip-routerstop)
+    sip-router_stop
 	;;
 	;;
-  serrestart)
-	ser_stop
+  sip-routerrestart)
+	sip-router_stop
 	echo
 	echo
-	ser_start
+	sip-router_start
 	;;
 	;;
   start)
   start)
     monit_start
     monit_start

+ 1 - 1
rad_dict.h

@@ -26,7 +26,7 @@
  */
  */
 
 
 /*
 /*
- * WARNING: Don't forget to update sip_router/etc/dictionary.ser if you 
+ * WARNING: Don't forget to update sip_router/etc/dictionary.sip-router if you 
  * update this file !
  * update this file !
  */
  */
 
 

+ 24 - 24
ser.8

@@ -1,12 +1,12 @@
 .\" $Id$
 .\" $Id$
-.TH ser 8 15.07.2002 ser "Sip Express Router" 
+.TH sip-router 8 15.07.2002 sip-router "Sip Express Router" 
 .\" Process with
 .\" Process with
-.\" groff -man -Tascii ser.8
+.\" groff -man -Tascii sip-router.8
 .\"
 .\"
 .SH NAME
 .SH NAME
-ser \- very fast and configurable sip proxy
+sip-router \- very fast and configurable sip proxy
 .SH SYNOPSIS
 .SH SYNOPSIS
-.B ser
+.B sip-router
 [
 [
 .B \-hcrRvdDEVT
 .B \-hcrRvdDEVT
 ] [
 ] [
@@ -36,7 +36,7 @@ ser \- very fast and configurable sip proxy
 ]
 ]
 
 
 .SH DESCRIPTION
 .SH DESCRIPTION
-.B ser 
+.B sip-router 
 or
 or
 .BR Sip
 .BR Sip
 .BR Express 
 .BR Express 
@@ -68,7 +68,7 @@ Turns on debugging, multiple
 increase the debug level.
 increase the debug level.
 .TP
 .TP
 .BI \-D
 .BI \-D
-Runs ser in the foreground (it doesn't fork into daemon mode).
+Runs sip-router in the foreground (it doesn't fork into daemon mode).
 .TP
 .TP
 .BI \-E
 .BI \-E
 Sends all the log messages to stderr.
 Sends all the log messages to stderr.
@@ -83,7 +83,7 @@ Displays the version number.
 Reads the configuration from 
 Reads the configuration from 
 .B " config\-file" 
 .B " config\-file" 
 (default
 (default
-.I  /etc/ser/ser.cfg
+.I  /etc/sip-router/sip-router.cfg
 ).
 ).
 .TP
 .TP
 .BI \-l " address"
 .BI \-l " address"
@@ -111,60 +111,60 @@ Size of the shared memory which will be allocated (in Megabytes).
 .TP
 .TP
 .BI \-w " working\-dir" 
 .BI \-w " working\-dir" 
 Specifies the working directory. In the very improbable event that 
 Specifies the working directory. In the very improbable event that 
-.B ser 
+.B sip-router 
 will crash, the core file will be generated here.
 will crash, the core file will be generated here.
 .TP
 .TP
 .BI \-t " chroot\-dir"
 .BI \-t " chroot\-dir"
 Forces 
 Forces 
-.B ser 
+.B sip-router 
 to chroot after reading the config file.
 to chroot after reading the config file.
 .TP
 .TP
 .BI \-u " uid"
 .BI \-u " uid"
 Changes the user id under which 
 Changes the user id under which 
-.B ser
+.B sip-router
 runs.
 runs.
 .TP
 .TP
 .BI \-g " gid"
 .BI \-g " gid"
 Changes the group id under which 
 Changes the group id under which 
-.B ser
+.B sip-router
 runs.
 runs.
 .TP
 .TP
 .BI \-P " pid\-file"
 .BI \-P " pid\-file"
 Creates a file containing the pid of the main
 Creates a file containing the pid of the main
-.B ser
+.B sip-router
 process.
 process.
 .TP
 .TP
 .BI \-L " modules\-dir"
 .BI \-L " modules\-dir"
 Specifies the directory where to look for
 Specifies the directory where to look for
-.B ser
-modules (default: /usr/lib/ser/modules)
+.B sip-router
+modules (default: /usr/lib/sip-router/modules)
 
 
 .SH FILES
 .SH FILES
 .PD 0
 .PD 0
-.B /usr/sbin/ser
+.B /usr/sbin/sip-router
 .br
 .br
-.B /etc/ser/ser.cfg
+.B /etc/sip-router/sip-router.cfg
 .br
 .br
-.B /usr/lib/ser/modules/*
+.B /usr/lib/sip-router/modules/*
 .PD
 .PD
 .SH AUTHORS
 .SH AUTHORS
 
 
 see 
 see 
-.B /usr/share/doc/ser/AUTHORS
+.B /usr/share/doc/sip-router/AUTHORS
 
 
 .SH SEE ALSO
 .SH SEE ALSO
-.BR ser.cfg(5)
+.BR sip-router.cfg(5)
 .PP
 .PP
-Full documentation on ser, including configuration guidelines, FAQs and
+Full documentation on sip-router, including configuration guidelines, FAQs and
 licensing conditions, is available at
 licensing conditions, is available at
-.I http://www.iptel.org/ser/.
+.I http://sip-router.org.
 .PP 
 .PP 
 For reporting  bugs see
 For reporting  bugs see
 .I
 .I
-http://www.iptel.org/ser/bugs/.
+http://sip-router.org/tracker/.
 .PP
 .PP
 Mailing lists:
 Mailing lists:
 .nf 
 .nf 
-s[email protected] - ser user community
+s[email protected] - sip-router user community
 .nf 
 .nf 
-s[email protected] - ser development, new features and unstable version
+s[email protected] - sip-router development, new features and unstable version