Merge commit 'origin/sr_3.0' into kamailio_3.0

* commit 'origin/sr_3.0':
  sctp: count rejects sent to the remote peer (stats)
  avp_db: Removes a spurious error message.
  ctl: missing ifdef (minor)
  event parser: Add missing string boundary checks to event_parser func.
  tm: Number of fixes in code and documentation for serial forking.
  Implements function reset_path_vector.
  core: fix fixup_spve_* reuse after free
  Remove obsolete gen_ha1.
  modules_k/permissions: Increased version number of 'trusted' table
  lib/srdb1/schema/trusted.xml: forgot to increase version number
  lib/srdb1/schema/trusted.xml: increased tag length from 32 to 64 chars
  makefile: support self-installing utils, extra cfgs a.s.o.
  core: fix memleak in fixup_free*

Conflicts:
	Makefile

lib/srdb1/schema/trusted.xml

@@ -9,7 +9,7 @@
 
 <table id="trusted" xmlns:db="http://docbook.org/ns/docbook">
     <name>trusted</name>
-    <version>4</version>
+    <version>5</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by the permissions module to determine if a call has the appropriate permission to be established. More information about the permissions module can be found at: &KAMAILIO_MOD_DOC;permissions.html
@@ -53,7 +53,7 @@
     <column>
         <name>tag</name>
         <type>string</type>
-        <size>32</size>
+        <size>64</size>
         <null/>
         <description>Tag</description>
     </column>

mod_fix.c

@@ -197,7 +197,6 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS)
 		int ret; \
 		char * bkp; \
 		fparam_t* fp; \
-		bkp=*param; \
 		if (param_no<=(no1)){ \
 			if ((ret=fix_param_types(FPARAM_PVE, param))<0){ \
 				ERR("Cannot convert function parameter %d to" #type2 "\n", \
@@ -206,6 +205,8 @@ FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS)
 			} else{ \
 				fp=(fparam_t*)*param; \
 				if ((ret==0) && (fp->v.pve->spec.getf==0)){ \
+					bkp=fp->orig; \
+					fp->orig=0; /* make sure orig string is not freed */ \
 					fparam_free_contents(fp); \
 					pkg_free(fp); \
 					*param=bkp; \

modules/ctl/ctl.c

@@ -250,11 +250,13 @@ static int mod_init(void)
 						payload_proto_name(l->data_proto), l->name,
 						l->port?l->port:DEFAULT_CTL_PORT);
 				break;
+#ifdef USE_FIFO
 			case FIFO_SOCK:
 				DBG("        [%s:fifo]         %s\n",
 						payload_proto_name(l->data_proto), l->name);
 				fd_no++; /* fifos use 2 fds */
 				break;
+#endif
 			default:
 				LOG(L_CRIT, "BUG: ctrl: listen protocol %d not supported\n",
 						l->proto);

modules/tm/config.c

@@ -48,6 +48,7 @@ struct cfg_group_tm	default_tm_cfg = {
 	1,	/* via1_matching */
 	FR_TIME_OUT,	/* fr_timeout */
 	INV_FR_TIME_OUT,	/* fr_inv_timeout */
+	INV_FR_TIME_OUT_NEXT, /* fr_inv_timeout_next */
 	WT_TIME_OUT,	/* wait_timeout */
 	DEL_TIME_OUT,	/* delete_timeout */
 	RETR_T1,	/* rt_t1_timeout */
@@ -90,8 +91,6 @@ struct cfg_group_tm	default_tm_cfg = {
 			 * for every method except BYE by default */
 	1,	/* cancel_b_method used for e2e and 6xx cancels*/
 	1,	/* reparse_on_dns_failover */
-	INV_FR_TIME_OUT_NEXT, /* fr_inv_timeout_next -> for serial forking subseq.
-							 branches */
 	0 /* disable_6xx, by default off */
 };
 
@@ -109,6 +108,8 @@ cfg_def_t	tm_cfg_def[] = {
 	{"fr_inv_timer",	CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup, 0,
 		"timer which hits if no final reply for an INVITE arrives "
 		"after a provisional message was received (in milliseconds)"},
+	{"fr_inv_timer_next",	CFG_VAR_INT,	0, 0, 0, 0,
+		"The value [ms] of fr_inv_timer for subsequent branches during serial forking."},
 	{"wt_timer",		CFG_VAR_INT | CFG_ATOMIC,	0, 0, timer_fixup, 0,
 		"time for which a transaction stays in memory to absorb "
 		"delayed messages after it completed"},
@@ -183,8 +184,6 @@ cfg_def_t	tm_cfg_def[] = {
 		"if set to 1, the SIP message after a DNS failover is "
 		"constructed from the outgoing message buffer of the failed "
 		"branch instead of from the received request"},
-	{"fr_inv_timer_next",	CFG_VAR_INT,	0, 0, timer_fixup, 0,
-		"The value of fr_inv_timer for subsequent branches during serial forking"},
 	{"disable_6xx_block",	CFG_VAR_INT | CFG_ATOMIC,	0, 1, 0, 0,
 		"if set to 1, 6xx is treated like a normal reply (breaks rfc)"},
 	{0, 0, 0, 0, 0, 0}

modules/tm/config.h

@@ -53,7 +53,6 @@
 #define INV_FR_TIME_OUT   120000 /* ms */
 
 /*! \brief final response timers to be used for serial forwarding */
-#define INV_FR_TIME_OUT_FIRST 90000 /* ms */
 #define INV_FR_TIME_OUT_NEXT  30000 /* ms */
 
 /* WAIT timer ... tells how long state should persist in memory after
@@ -107,6 +106,7 @@ struct cfg_group_tm {
 	int	via1_matching;
 	unsigned int	fr_timeout;
 	unsigned int	fr_inv_timeout;
+	unsigned int    fr_inv_timeout_next;
 	unsigned int	wait_timeout;
 	unsigned int	delete_timeout;
 	unsigned int	rt_t1_timeout;
@@ -133,7 +133,6 @@ struct cfg_group_tm {
 	unsigned int	tm_blst_methods_lookup;
 	unsigned int	cancel_b_flags;
 	int	reparse_on_dns_failover;
-	unsigned int fr_inv_timeout_next;
 	int disable_6xx;
 };
 

modules/tm/doc/functions.xml

@@ -1031,14 +1031,58 @@ failure_route[1] {
 		<function moreinfo="none">t_load_contacts()</function>
 		</title>
 		<para>
-                Loads contacts in destination set in increasing qvalue order as
-                values of contacts_avp. If all contacts in the destination set
-                have the same qvalue, t_load_contacts() does not do
-                anything thus 
-                minimizing performance impact of serial forking capability
-                when it is not needed. Returns 1 if loading of contacts
-                succeeded or there was nothing to do. Returns -1 on error (see
-                syslog).
+		  This is the first of the two functions that can be used to implement
+		  serial/parallel forking based on the q value of individual branches
+		  in a destination set.
+		</para>
+		<para>
+		  The function <function>t_load_contacts()</function> takes all
+		  branches from the current destination set and encodes them into the
+		  AVP whose name or ID is configured with the
+		  parameter <varname>contacts_avp</varname>. Note that you have to
+		  configure this parameter before you can use the function, the
+		  parameter is set to NULL by default, which disables the function.
+		</para>
+		<para>
+		  If the destination set contains only one branch (the Request-URI) or
+		  if all branches have the same q value then the function does nothing
+		  to minimize performance impact. In such case all branches should be
+		  tried in parallel and that is the default mode of operation of
+		  functions like <function>t_relay()</function>, so there is no need
+		  to create the AVP or sort the branches.
+		</para>
+		<para>
+		  If the current destination set contains more than one branch and not
+		  all branches have the same q value then the function sorts them
+		  according to the increasing value of the q parameter. The resulting
+		  sorted list of branches is then encoded into the AVP.
+		</para>
+		<para>
+		  The q parameter contains a value from a range of 0 to 1.0 and it
+		  expresses relative preferrence of the branch among all branches in
+		  the destination set. The higher the q value the more preferrence the
+		  user agent gave to the branch. Branches with higher q values will be
+		  tried first when serial forking takes place.
+		</para>
+		<para>
+		  After that the function clears all branches and you have to
+		  call <function>t_next_contacts</function> to retrieve them sorted
+		  according to their q value. Note that if you
+		  use <function>t_load_contacts</function> then you also have to
+		  use <function>t_next_contacts</function> before
+		  calling <function>t_relay</function>.
+		</para>
+		<para>
+		  The AVP created by the function may contain multiple values, with
+		  one encoded branch per value. The first value will contain the
+		  branch with the highest q value. Each value contains the
+		  Request-URI, the destination URI, the path vector, the outgoing
+		  socket description and branch flags. All these fields are delimited
+		  with the LF character.
+		</para>
+		<para>
+          The function returns 1 if loading of contacts succeeded or there was
+          nothing to do. Returns -1 on error (see syslog).
 		</para>
 		<para>
 		This function can be used from REQUEST_ROUTE.
@@ -1061,24 +1105,61 @@ if (!t_load_contacts()) {
 		<function moreinfo="none">t_next_contacts()</function>
 		</title>
 		<para>
-                If transaction does not exist when t_next_contacts() is
-                called, replaces Request-URI with the
-                first contacts_avp value, adds the remaining contacts_avp values
-                with the same qvalue as branches, and destroys those AVPs. It
-                does nothing if there are no contacts_avp values. Returns 1 if
-                there were no errors and -1 if an error occurred (see syslog).
+		  The function <function>t_next_contacts</function> is the second of
+		  the two functions that can be used to implement serial/parallel
+		  forking based on the q value of individual branches in a destination
+		  set.
+		</para>
+		<para>
+		  This function takes the AVP created
+		  by <function>t_load_contacts</function> and extracts branches with
+		  highest q value from it into the destination set when called for the
+		  first time. When you call the function second time it extracts
+		  branches with lower q value, and so on until all branches have been
+		  extracted.	  
+		</para>
+		<para>
+          If no transaction exist when <function>t_next_contacts()</function>
+          is called, this usually happens when you call the function from a
+          request route block before you call <function>t_relay</function>, it
+          replaces the Request-URI with the first contacts_avp value, adds the
+          remaining contacts_avp values with the same q value as branches, and
+          destroys those AVPs. 
+		</para>
+        <para>
+          If transaction does exist when t_next_contacts() is called, it adds
+          the first <varname>contacts_avp</varname> value and all following
+          <varname>contacts_avp</varname> values with the same q value as new
+          branches to request and destroys those AVPs. 
+        </para>
+		<para>
+		  When you call the function repeatedly from a failure_route branch,
+		  it looks for more AVP values each time and adds branches that have
+		  same q value from the AVP as additional destination set branches. It
+		  always stops when it reaches a branch that has a lower q value. Used
+		  AVP values are always destroyed.,
+		</para>
+		<para>
+		  The function does nothing if there are
+		  no <varname>contact_avp</varname> values.
+		</para>
+		<para>
+          The function returns 1 if there were no errors and -1 if an error
+          occurred (see syslog). This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+		</para>
+		<para>
+		  Note that if use use <function>t_load_contacts</function>
+		  and <function>t_next_contacts</function> functions then you should
+		  also set the value of <varname>restart_fr_on_each_reply</varname>
+		  parameter to 0. If you do not do that then it can happen that a
+		  broken user agent that retransmits 180 periodically will keep
+		  resetting the fr_inv_timer value and serial forking never happens.
 		</para>
-                <para>
-                If transaction does exist when t_next_contacts() is
-                called, adds the first contacts_avp value and all
-                following contacts_avp values with the 
-                same qvalue as new branches to request and destroys those AVPs.
-                Returns 1 if new branches were successfully added and -1 on
-                error (see syslog) or if there were no more contacts_avp
-                values.
-                </para>
 		<para>
-		This function can be used from REQUEST_ROUTE and FAILURE_ROUTE.
+		  Also make sure that you
+		  configured <varname>fr_inv_timer_next</varname> with lower value,
+		  especially if you expect to have many serially forked branches. See
+		  the documentation of that parameter for more details.
 		</para>
 		<example>
 		<title><function>t_next_contacts</function> usage</title>

modules/tm/doc/params.xml

@@ -744,38 +744,77 @@ onreply_route["stateless_replies"] {
     </section>
 
 	<section>
-		<title><varname>fr_inv_timer_next</varname> (integer)</title>
-		<para>
-                Value of the Final Response timeout for INVITE
-                transactions to be used during serial forwarding:
-		</para>
-		<para>
-                Function t_next_contacts() sets fr_inv_timer to
-                fr_inv_timer_next value if, after t_next_contacts() is
-                called, there are still lower qvalue contacts available,
-                and to fr_inv_timer value if there are not.
-		</para>
-		<para>
+	  <title><varname>fr_inv_timer_next</varname> (integer)</title>
+	  <para>
+		This parameter can be used to configure an alternative value for the
+		fr_inv_timer timer. This alternative value is used in place
+		of <varname>fr_inv_timer</varname> when serial forking takes place. It
+		is used for all branches during serial forking except the last one.
+		The last branch (or a set of parallel branches) use the original value
+		from <varname>fr_inv_timer</varname> again.
+	  </para>
+	  <para>
+		The purpose of the timer is to allow an administrator to configure a
+		shorter version of <varname>fr_inv_timer</varname> that is used only
+		when serial forking takes place. Forwarding branches one after another
+		is much more time consuming, because every serial branch has to wait
+		for the result of the previous one. That can take up to the value
+		of <varname>fr_inv_timer</varname> and this timer is configured to two
+		minutes by default. Hence, if you have three serial branches then
+		completing the transaction can take six minutes with default timer values.
+	  </para>
+	  <para>
+		In practise, the transaction will be terminated sooner, because the
+		timer <varname>max_inv_lifetime</varname> hits after three minutes.
+		Thus, some of the serial branches might not be forwarded at all. And
+		this is exactly what <varname>fr_inv_timer_next</varname> is for. You
+		can configure the timer to a shorter value to ensure that all serial
+		branches are tried before the
+		timer <varname>max_inv_lifetime</varname> hits.
+	  </para>
+	  <para>
+		Note that if there is only one branch or if the current serial branch
+		is the last one (i.e. no more serial forking takes place after this
+		branch is finished) then <varname>fr_inv_timer_next</varname> is not
+		used, instead the branch uses the
+		longer <varname>fr_inv_timer</varname>.
+	  </para>
+	  <para>
+        Function <function>t_next_contacts()</function>
+        sets <varname>fr_inv_timer</varname>
+        to <varname>fr_inv_timer_next</varname> if serial forking takes place
+        and there is more than one serial branch.
+	  </para>
+	  <para>
+		The administrator can configure the value of this timer using the
+		configuration framework on the fly. But
+		unlike <varname>fr_inv_timer</varname>, it is not possible to
+		configure the value of this timer on per-transaction basis.
+	  </para>
+	  <para>
 		<emphasis>
-			Default value is 30.
+		  The value of this timer is to be specified in milliseconds. The
+		  default value is 30000ms.
 		</emphasis>
-		</para>
-		<example>
+	  </para>
+	  <example>
 		<title>Set <varname>fr_inv_timer_next</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("tm", "fr_inv_timer_next", 10)
+modparam("tm", "fr_inv_timer_next", 10000)
 ...
-</programlisting>
-		</example>
+		</programlisting>
+	  </example>
 	</section>
-
+	
 	<section>
 		<title><varname>contacts_avp</varname> (string)</title>
 		<para>
-                Internal AVP that t_load_contacts() function uses to store
-                contacts of the destination set and that
-                t_next_contacts() function uses to restore those contacts.
+		  This is the name or Id of an AVP
+                that <function>t_load_contacts()</function> function uses to
+                store contacts of the destination set and that
+                <function>t_next_contacts()</function> function uses to
+                restore those contacts.
 		</para>
 		<para>
 		<emphasis>

modules/tm/doc/tm.xml

@@ -104,6 +104,212 @@
 		it to see if what you are looking for is there.</para>
 	</note>
     </section>
+
+	<section id="tm.serial_forking">
+	  <title>Serial Forking Based on Q Value</title>
+	  <para>
+		A single SIP INVITE request may be forked to multiple destinations. We
+		call the set of all such destinations a destination set. Individual
+		elements within the destination sets are called branches. The script
+		writer can add URIs to the destination set from the configuration
+		file, or they can be loaded from the user location database, each
+		registered contact then becomes one branch in the destination set.
+	  </para>
+	  <para>
+		The default behavior of the tm module, if it encounters a SIP message
+		with multiple branches in the destination set, it to forward the SIP
+		message to all the branches in parallel. That means it sends the
+		message to all the branch destinations before it waits for replies
+		from any of them. This is the default behavior if you
+		call <function>t_relay()</function> and similar functions without
+		anything else.
+	  </para>
+	  <para>
+		Another approach of handling multiple branches in a destination set it
+		serial forking. When configured to do serial forking, the server takes
+		the first branch out of the destination set, forwards the message to
+		its destination and waits for a reply or timeout. Only after a reply
+		has been received or the timeout occurred, the server takes another
+		destination from the destination set and tries again, until it
+		receives a positive final reply or until all branches from the
+		destination set have been tried.
+	  </para>
+	  <para>
+		Yet another, more sophisticated, way of handling multiple branches is
+		combined serial/parallel forking, where individual branches within the
+		destination set are assigned priorities. The order in which individual
+		branches are tried is then determined by their relative priority
+		within the destination set. Branches can be tried sequentially in the
+		descending priority order and all branches that have the same priority
+		can be tried in parallel. Such combined serial/parallel forking can be
+		achieved in the tm module with the help of
+		functions <function>t_load_contacts()</function>
+		and <function>t_next_contacts()</function>.
+	  </para>
+	  <para>
+		Every branch in the destination set is assigned a priority number,
+		also known as the q value. The q value is a floating point number in a
+		range 0 to 1.0. The higher the q value number, the more priority is
+		the particular branch in the destination set is given. Branches with q
+		value 1.0 have maximum priority, such branches should be always tried
+		first in serial forking. Branches with q value 0 have the lowest
+		priority and they should by tried after all other branches with higher
+		priority in the destination set.
+	  </para>
+	  <para>
+		As an example, consider the following simple configuration file. When
+		the server receives an INVITE, it creates four branches for it with
+		usernames A through D and then forwards the request
+		using <function>t_relay()</function>:
+	  </para>
+	  <programlisting format="linespecific">
+route {
+  seturi("sip:[email protected]");
+  append_branch("sip:[email protected]");
+  append_branch("sip:[email protected]");
+  append_branch("sip:[email protected]");
+
+  t_relay();
+  break;
+}
+</programlisting>
+	  <para>
+		With this configuratin the server forwards the request to all four
+		branches at once, performing parallel forking described above. We did
+		not set the q value for individual branches in this example but we can
+		do that by slightly modifying the arguments given
+		to <function>append_branch()</function>:
+	  </para>
+	  <programlisting format="linespecific">
+route {
+  seturi("sip:[email protected]");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "1.0");
+
+  t_relay();
+  break;
+}	 
+</programlisting>
+	  <para>
+		Here we assigned q value 0.5 to branches B and C and q value 1.0 to
+		branch D. We did not specify any q value for branch A and in that case
+		it is assumed that its q value is the lowest from all branches within
+		the destination set. If you try to run this example again, you will
+		figure out that nothing changed, <function>t_relay()</function> still
+		forward the message to all branches in parallel.
+	  </para>
+	  <para>
+		We now want to implement the combined serial/parallel forking. Branch
+		D should be tried first, because its q value is 1.0. Branches B and C
+		should be tried in parallel, but only after D finishes. Branch A
+		should be tried after B and C finished, because its q value (the
+		default) is the lowest of all. To do that, we need to introduce two
+		new functions into our example and one tm module parameter:
+	  </para>
+	  <programlisting format="linespecific">
+modparam("tm", "contacts_avp", "tm_contacts");
+
+route {
+  seturi("sip:[email protected]");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "1.0");
+
+  t_load_contacts();
+
+  t_next_contacts();
+  t_relay();
+  break;
+}	 
+</programlisting>
+	  <para>
+		First of all, the tm module parameter is mandatory if the two new
+		functions are used. Function <function>t_load_contacts()</function>
+		takes all branches from the destination set, sorts them according to
+		their q values and stores them in the AVP configured in the modparam.
+		The function also clears the destination set, which means that it
+		removes all branches configured before
+		with <function>seturi()</function>
+		and <function>append_branch()</function>.
+	  </para>
+	  <para>
+		Function <function>t_next_contacts()</function> takes the AVP created
+		by the previous function and extract the branches with highest q
+		values from it. In our example it is branch D. That branch is then put
+		back into the destination set and when the script finally
+		reaches <function>t_relay()</function>, the destination set only
+		contains branch D and the request will be forwarded there.
+	  </para>
+	  <para>
+		We achieved the first step of serial forking, but this is not
+		sufficient. Now we also need to forward to other branches with lower
+		priority values when branch D finishes. To do that, we need to extend
+		the configuration file again and introduce a failure_route section:
+		</para>
+	  <programlisting format="linespecific">
+modparam("tm", "contacts_avp", "tm_contacts");
+
+route {
+  seturi("sip:[email protected]");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "0.5");
+  append_branch("sip:[email protected]", "1.0");
+
+  t_load_contacts();
+
+  t_next_contacts();
+  t_on_failure("serial");
+  t_relay();
+  break;
+}
+
+failure_route["serial"]
+{
+  if (!t_next_contacts()) {
+    exit;
+  }
+
+  t_on_failure("serial");
+  t_relay();
+}
+</programlisting>
+	  <para>
+		The failure_route section will be executed when branch D finishes. It
+		executes <function>t_next_contacts()</function> again and this time
+		the function retrieves branches B and C from the AVP and adds them to
+		the destination set. Here we need to check the return value of the
+		function, because a negative value indicates that there were no more
+		branches, in that case the failure_route should just terminate and
+		forward the response from branch D upstream.
+	  </para>
+	  <para>
+		If <function>t_next_contact()</function> returns a positive value then
+		we have more new branches to try and we need to setup the
+		failure_route again and call <function>t_relay()</function>. In our
+		example the request will now be forwarded to branches B and C in
+		paralell, because they were both added to the destination set
+		by <function>t_next_contacts()</function> at the same time.
+	  </para>
+	  <para>
+		When branches B and C finish, the failure_route block is executed
+		again, this time <function>t_next_contacts()</function> puts the final
+		branch A into the destination set and <function>t_relay()</function>
+		forwards the request there.
+	  </para>
+	  <para>
+		And that's the whole example, we achieved combined serial/parallel
+		forking based on the q value of individual branches. In real-world
+		configuration files the script writer would need to check the return
+		value of all functions and also configure some additional parameters,
+		such as <varname>fr_inv_timer_next</varname>
+		and <varname>restart_fr_on_each_reply</varname>. Also the destination
+		set would not be configured directly in the configuration file, but
+		can be retrieved from the user location database, for example. In that
+		case registered contacts will be stored in the destination set as
+		branches and their q values (provided by UAs) will be used.
+	  </para>
+	</section>
     
     <section id="tm.known_issues">
 	<title>Known Issues</title>
@@ -135,6 +341,18 @@
 		    longer so much as there is a new replication module).
 		</para>
 	    </listitem>
+	    <listitem>
+		<para>
+		    Function <function>t_next_contacts</function> should restore the
+		    value of timer <varname>fr_inv_timer</varname> when there are no
+		    more branches to be processed serially. The function can restore
+		    the timer properly if it has been configured through an AVP or
+		    with the config framework, but may fail to restore timer values
+		    configured for individual transactions
+		    with <function>t_set_fr</function>.
+		</para>
+	    </listitem>
+
 	</itemizedlist>
     </section>
     

modules/tm/t_serial.c

@@ -42,9 +42,6 @@
 /* usr_avp flag for sequential forking */
 #define Q_FLAG      (1<<2)
 
-/* module parameter variable */
-int fr_inv_timer_next = INV_FR_TIME_OUT_NEXT;
-
 /* Struture where information regarding contacts is stored */
 struct contact {
     str uri;
@@ -118,72 +115,100 @@ static inline int decode_branch_info(char *info, str *uri, str *dst, str *path,
     int port, proto;
     char *pos, *at, *tmp;
 
-    pos = strchr(info, '\n');
-    uri->len = pos - info;
-    if (uri->len) {
-		uri->s = info;
-    } else {
-		uri->s = 0;
+	if (info == NULL) {
+		ERR("decode_branch_info: Invalid input string.\n");
+		return 0;
+	}
+	
+	/* Reset or return arguments to sane defaults */
+	uri->s = 0; uri->len = 0;
+	dst->s = 0; dst->len = 0;
+	path->s = 0; path->len = 0;
+	*sock = NULL;
+	*flags = 0;
+	
+	/* Make sure that we have at least a non-empty URI string, it is fine if
+	 * everything else is missing, but we need at least the URI. */
+	uri->s = info; 
+	if ((pos = strchr(info, '\n')) == NULL) { 
+		uri->len = strlen(info); 
+			/* We don't even have the URI string, this is bad, report an
+			 * error. */
+		if (uri->len == 0) goto uri_missing;
+		return 1;
     }
-    at = pos + 1;
-
-    pos = strchr(at, '\n');
-    dst->len = pos - at;
-    if (dst->len) {
-		dst->s = at;
-    } else {
-		dst->s = 0;
+	uri->len = pos - info;
+	if (uri->len == 0) goto uri_missing;
+
+	/* If we get here we have at least the branch URI, now try to parse as
+	 * much as you can. All output variable have been initialized above, so it
+	 * is OK if any of the fields are missing from now on. */
+    dst->s = at = pos + 1;
+    if ((pos = strchr(at, '\n')) == NULL) {
+		dst->len = strlen(dst->s);
+		return 1;
     }
-    at = pos + 1;
+	dst->len = pos - at;
 
-    pos = strchr(at, '\n');
-    path->len = pos - at;
-    if (path->len) {
-		path->s = at;
-    } else {
-		path->s = 0;
+    path->s = at = pos + 1;
+    if ((pos = strchr(at, '\n')) == NULL) {
+		path->len = strlen(path->s);
+		return 1;
     }
-    at = pos + 1;
+    path->len = pos - at;
 
-    pos = strchr(at, '\n');
-    s.len = pos - at;
-    if (s.len) {
-		s.s = at;
+    s.s = at = pos + 1;
+    if ((pos = strchr(at, '\n')) == NULL) {
+		/* No LF found, that means we take the string till the final zero
+		 * termination character and pass it directly to parse_phostport
+		 * without making a zero-terminated copy. */
+		tmp = s.s;
+		s.len = strlen(s.s);
+	} else {
+		/* Our string is terminated by LF, so we need to make a
+		 * zero-terminated copy of the string before we pass it to
+		 * parse_phostport. */
+		s.len = pos - at;
 		if ((tmp = as_asciiz(&s)) == NULL) {
 			ERR("No memory left\n");
 			return 0;
 		}
+	}	
+	if (s.len) {
 		if (parse_phostport(tmp, &host.s, &host.len,
 							&port, &proto) != 0) {
-			LM_ERR("parsing of socket info <%.*s> failed\n",  s.len, s.s);
-			pkg_free(tmp);
+			LM_ERR("parsing of socket info <%s> failed\n", tmp);
+			if (pos) pkg_free(tmp);
 			return 0;
 		}
-		pkg_free(tmp);
+
 		*sock = grep_sock_info(&host, (unsigned short)port,
 							   (unsigned short)proto);
 		if (*sock == 0) {
-			LM_ERR("invalid socket <%.*s>\n", s.len, s.s);
+			LM_ERR("invalid socket <%s>\n", tmp);
+			if (pos) pkg_free(tmp);
 			return 0;
 		}
-    } else {
-		*sock = 0;
-    }
-    at = pos + 1;
+	}
+	
+	if (pos) pkg_free(tmp);
+	else return 1;
+	
+    s.s = at = pos + 1;
+    if ((pos = strchr(at, '\n')) == NULL) s.len = strlen(s.s);
+    else s.len = pos - s.s;
 
-    pos = strchr(at, '\n');
-    s.len = pos - at;
     if (s.len) {
-		s.s = at;
 		if (str2int(&s, flags) != 0) {
-			LM_ERR("failed to decode flags <%.*s>\n", s.len, s.s);
+			LM_ERR("failed to decode flags <%.*s>\n", STR_FMT(&s));
 			return 0;
 		}
-    } else {
-		*flags = 0;
     }
-
     return 1;
+
+uri_missing:
+	ERR("decode_branch_info: Cannot decode branch URI.\n");
+	return 0;
 }
 
 
@@ -349,7 +374,7 @@ rest:
 				contacts_avp, val);
 		pkg_free(branch_info.s);
 		LM_DBG("loaded contact <%.*s> with q_flag <%d>\n",
-			   val.s.len, val.s.s, curr->q_flag);
+			   STR_FMT(&val.s), curr->q_flag);
 		curr = curr->next;
     }
 
@@ -379,6 +404,8 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
     unsigned int flags;
     struct cell *t;
 	struct search_state st;
+	ticks_t orig;
+	unsigned int avp_timeout;
 
     /* Check if contacts_avp has been defined */
     if (contacts_avp.n == 0) {
@@ -405,45 +432,44 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
 			return 1;
 		}
 
-		LM_DBG("next contact is <%s>\n", val.s.s);
+		LM_DBG("next contact is <%.*s>\n", STR_FMT(&val.s));
 
 		if (decode_branch_info(val.s.s, &uri, &dst, &path, &sock, &flags)
 			== 0) {
-			LM_ERR("decoding of branch info <%.*s> failed\n",
-				   val.s.len, val.s.s);
+			LM_ERR("decoding of branch info <%.*s> failed\n", STR_FMT(&val.s));
 			destroy_avp(avp);
 			return -1;
 		}
 
 		/* Rewrite Request-URI */
 		rewrite_uri(msg, &uri);
-		set_dst_uri(msg, &dst);
-		set_path_vector(msg, &path);
+		if (dst.s && dst.len) set_dst_uri(msg, &dst);
+		else reset_dst_uri(msg);
+		if (path.s && path.len) set_path_vector(msg, &path);
+		else reset_path_vector(msg);
 		msg->force_send_socket = sock;
 		setbflagsval(0, flags);
 
 		if (avp->flags & Q_FLAG) {
 			destroy_avp(avp);
 			/* Set fr_inv_timer */
-			val.n = fr_inv_timer_next;
-			if (add_avp(fr_inv_timer_avp_type, fr_inv_timer_avp, val) != 0) {
-				LM_ERR("setting of fr_inv_timer_avp failed\n");
+			if (t_set_fr(msg, cfg_get(tm, tm_cfg, fr_inv_timeout_next), 0) 
+				== -1) {
+				ERR("Cannot set fr_inv_timer value.\n");
 				return -1;
 			}
 			return 1;
 		}
-
+		
 		/* Append branches until out of branches or Q_FLAG is set */
 		prev = avp;
 		while ((avp = search_next_avp(&st, &val))) {
 			destroy_avp(prev);
-
-			LM_DBG("next contact is <%s>\n", val.s.s);
+			LM_DBG("next contact is <%.*s>\n", STR_FMT(&val.s));
 
 			if (decode_branch_info(val.s.s, &uri, &dst, &path, &sock, &flags)
 				== 0) {
-				LM_ERR("decoding of branch info <%.*s> failed\n",
-					   val.s.len, val.s.s);
+				LM_ERR("decoding of branch info <%.*s> failed\n", STR_FMT(&val.s));
 				destroy_avp(avp);
 				return -1;
 			}
@@ -456,35 +482,30 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
 
 			if (avp->flags & Q_FLAG) {
 				destroy_avp(avp);
-				val.n = fr_inv_timer_next;
-				if (add_avp(fr_inv_timer_avp_type, fr_inv_timer_avp, val)
-					!= 0) {
-					LM_ERR("setting of fr_inv_timer_avp failed\n");
+				/* Set fr_inv_timer */
+				if (t_set_fr(msg, cfg_get(tm, tm_cfg, fr_inv_timeout_next), 0) == -1) {
+					ERR("Cannot set fr_inv_timer value.\n");
 					return -1;
 				}
 				return 1;
 			}
 			prev = avp;
 		}
-	
+		destroy_avp(prev);
     } else {
-	
-		/* Transaction exists => only load branches */
+			/* Transaction exists => only load branches */
 
 		/* Find first contacts_avp value */
 		avp = search_first_avp(contacts_avp_type, contacts_avp, &val, &st);
 		if (!avp) return -1;
 
 		/* Append branches until out of branches or Q_FLAG is set */
-		prev = avp;
 		do {
-
-			LM_DBG("next contact is <%s>\n", val.s.s);
+			LM_DBG("next contact is <%.*s>\n", STR_FMT(&val.s));
 
 			if (decode_branch_info(val.s.s, &uri, &dst, &path, &sock, &flags)
 				== 0) {
-				LM_ERR("decoding of branch info <%.*s> failed\n",
-					   val.s.len, val.s.s);
+				LM_ERR("decoding of branch info <%.*s> failed\n", STR_FMT(&val.s));
 				destroy_avp(avp);
 				return -1;
 			}
@@ -503,16 +524,49 @@ int t_next_contacts(struct sip_msg* msg, char* key, char* value)
 			prev = avp;
 			avp = search_next_avp(&st, &val);
 			destroy_avp(prev);
-
 		} while (avp);
 
-		/* Restore fr_inv_timer */
-		val.n = default_tm_cfg.fr_inv_timeout;
-		if (add_avp(fr_inv_timer_avp_type, fr_inv_timer_avp, val) != 0) {
-			LM_ERR("setting of fr_inv_timer_avp failed\n");
-			return -1;
+		/* If we got there then we have no more branches for subsequent serial
+		 * forking and the current set is the last one. For the last set we do
+		 * not use the shorter timer fr_inv_timer_next anymore, instead we use
+		 * the usual fr_inv_timer.
+		 *
+		 * There are three places in sip-router which can contain the actual
+		 * value of the fr_inv_timer. The first place is the variable
+		 * use_fr_inv_timeout defined in timer.c That variable is set when the
+		 * script writer calls t_set_fr in the script. Its value can only be
+		 * used from within the process in which t_set_fr was called. It is
+		 * not guaranteed that when we get here we are still in the same
+		 * process and therefore we might not be able to restore the correct
+		 * value if the script writer used t_set_fr before calling
+		 * t_next_contacts. If that happens then the code below detects this
+		 * and looks into the AVP or cfg framework for other value. In other
+		 * words, t_next_contact does not guarantee that fr_inv_timer values
+		 * configured on per-transaction basis with t_set_fr will be correctly
+		 * restored.
+		 *
+		 * The second place is the fr_inv_timer_avp configured in modules
+		 * parameters. If that AVP exists and then its value will be correctly
+		 * restored by t_next_contacts. The AVP is an alternative way of
+		 * configuring fr_inv_timer on per-transaction basis, it can be used
+		 * interchangeably with t_set_fr. Function t_next_contacts always
+		 * correctly restores the timer value configured in the AVP.
+		 *
+		 * Finally, if we can get the value neither from user_fr_inv_timeout
+		 * nor from the AVP, we turn to the fr_inv_timeout variable in the cfg
+		 * framework. This variable contains module's default and it always
+		 * exists and is available. */
+		orig = (ticks_t)get_msgid_val(user_fr_inv_timeout, msg->id, int);
+		if (orig == 0) {
+			if (!fr_inv_avp2timer(&avp_timeout)) {
+				/* The value in the AVP is in seconds and needs to be
+				 * converted to ticks */
+				orig = S_TO_TICKS((ticks_t)avp_timeout);
+			} else {
+				orig = cfg_get(tm, tm_cfg, fr_inv_timeout);
+			}
 		}
-	
+		change_fr(t, orig, 0);
     }
 
     return 1;

modules/tm/tm.c

@@ -434,6 +434,7 @@ static param_export_t params[]={
 	{"via1_matching",       PARAM_INT, &default_tm_cfg.via1_matching         },
 	{"fr_timer",            PARAM_INT, &default_tm_cfg.fr_timeout            },
 	{"fr_inv_timer",        PARAM_INT, &default_tm_cfg.fr_inv_timeout        },
+	{"fr_inv_timer_next",   PARAM_INT, &default_tm_cfg.fr_inv_timeout_next   },
 	{"wt_timer",            PARAM_INT, &default_tm_cfg.wait_timeout          },
 	{"delete_timer",        PARAM_INT, &default_tm_cfg.delete_timeout        },
 	{"retr_timer1",         PARAM_INT, &default_tm_cfg.rt_t1_timeout         },
@@ -467,7 +468,6 @@ static param_export_t params[]={
 	{"cancel_b_method",     PARAM_INT, &default_tm_cfg.cancel_b_flags},
 	{"reparse_on_dns_failover", PARAM_INT, &default_tm_cfg.reparse_on_dns_failover},
 	{"on_sl_reply",         PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply   },
-	{"fr_inv_timer_next",   PARAM_INT, &default_tm_cfg.fr_inv_timeout_next   },
 	{"contacts_avp",        PARAM_STRING, &contacts_avp_param                },
 	{"disable_6xx_block",   PARAM_INT, &default_tm_cfg.disable_6xx           },
 	{0,0,0}

modules_k/permissions/trusted.c

@@ -40,7 +40,7 @@
 #include "../../parser/parse_from.h"
 #include "../../usr_avp.h"
 
-#define TABLE_VERSION 4
+#define TABLE_VERSION 5
 
 struct trusted_list ***hash_table;     /* Pointer to current hash table pointer */
 struct trusted_list **hash_table_1;   /* Pointer to hash table 1 */

modules_s/avp_db/extra_attrs.c

@@ -143,7 +143,7 @@ int declare_attr_group(modparam_t type, char* _param)
 		return -1;
 	}
 	param = *((str*)_param);
-	ERR("group def: %.*s\n", param.len, param.s);
+    DBG("group def: %.*s\n", param.len, param.s);
 	
 	rt = pkg_malloc(param.len + sizeof(*rt) + 1);
 	if (!rt) {

parser/msg_parser.c

@@ -783,6 +783,17 @@ int set_path_vector(struct sip_msg* msg, str* path)
 	return 0;
 }
 
+
+void reset_path_vector(struct sip_msg* msg)
+{
+	if(msg->path_vec.s != 0) {
+		pkg_free(msg->path_vec.s);
+	}
+	msg->path_vec.s = 0;
+	msg->path_vec.len = 0;
+}
+
+
 struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht)
 {
 	struct hdr_field *hdr;

parser/msg_parser.h

@@ -464,4 +464,7 @@ struct hdr_field* get_hdr(struct sip_msg *msg, enum _hdr_types_t ht);
 struct hdr_field* next_sibling_hdr(struct hdr_field *hf);
 
 int set_path_vector(struct sip_msg* msg, str* path);
+
+void reset_path_vector(struct sip_msg* msg);
+
 #endif

parser/parse_event.c

@@ -117,10 +117,16 @@ int event_parser(char* s, int len, event_t* e)
 	tmp.s = end;
 	trim_leading(&tmp);
 
-	if (tmp.s[0] == ';') {
+	e->params.list = NULL;
+	
+	if (tmp.len && (tmp.s[0] == ';')) {
+		/* Shift the semicolon and skip any leading whitespace, this is needed
+		 * for parse_params to work correctly. */
+		tmp.s++; tmp.len--;
+		trim_leading(&tmp);
+		if (!tmp.len) return 0;
+
 		/* We have parameters to parse */
-		tmp.s++;
-		tmp.len--;
 		if (e->type == EVENT_DIALOG) {
 			pclass = CLASS_EVENT_DIALOG;
 			phooks = (param_hooks_t*)&e->params.dialog;
@@ -130,10 +136,7 @@ int event_parser(char* s, int len, event_t* e)
 			ERR("event_parser: Error while parsing parameters parameters\n");
 			return -1;
 		}
-	} else {
-		e->params.list = NULL;
 	}
-
 	return 0;
 }
 

sctp_server.c

@@ -2149,6 +2149,8 @@ again:
 					WARN("failed to ABORT new sctp association %d (%s:%d):"
 							" %s (%d)\n", assoc_id, ip_addr2a(&ip),
 							su_getport(su), strerror(errno), errno);
+				}else{
+					SCTP_STATS_LOCAL_REJECT();
 				}
 			}
 			break;

sr_module.c

@@ -1189,7 +1189,7 @@ void fparam_free_contents(fparam_t* fp)
 		case FPARAM_INT:
 		case FPARAM_STR:
 			/* nothing to do */
-			return;
+			break;
 		case FPARAM_REGEX:
 			if (fp->v.regex){
 				regfree(fp->v.regex);
@@ -1225,6 +1225,10 @@ void fparam_free_contents(fparam_t* fp)
 			}
 			break;
 	}
+	if (fp->orig){
+		pkg_free(fp->orig);
+		fp->orig=0;
+	}
 }
 
 

utils/gen_ha1/.cvsignore

@@ -1,2 +0,0 @@
-gen_ha1
-

utils/gen_ha1/Makefile

@@ -1,13 +0,0 @@
-# $Id$
-#
-#  gen_ha1 Makefile
-# 
-
-include ../../Makefile.defs
-
-auto_gen=
-NAME=gen_ha1
-LIBS=../../md5.o
-
-
-include ../../Makefile.utils

utils/gen_ha1/calc.c

@@ -1,139 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2001-2003 FhG Fokus
- *
- * This file is part of ser, a free SIP server.
- *
- * ser is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the ser software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "calc.h"
-#include "../../md5global.h"
-#include "../../md5.h"
-
-
-void CvtHex(HASH Bin, HASHHEX Hex)
-{
-	unsigned short i;
-	unsigned char j;
-    
-	for (i = 0; i < HASHLEN; i++) {
-		j = (Bin[i] >> 4) & 0xf;
-		if (j <= 9)
-			Hex[i*2] = (j + '0');
-		else
-			Hex[i*2] = (j + 'a' - 10);
-		j = Bin[i] & 0xf;
-		if (j <= 9)
-			Hex[i*2+1] = (j + '0');
-		else
-			Hex[i*2+1] = (j + 'a' - 10);
-	};
-	Hex[HASHHEXLEN] = '\0';
-}
-
-
-/* 
- * calculate H(A1) as per spec 
- */
-void DigestCalcHA1(const char * pszAlg, const char * pszUserName,
-		   const char * pszRealm, const char * pszPassword,
-		   const char * pszNonce, const char * pszCNonce,
-		   HASHHEX SessionKey)
-{
-	MD5_CTX Md5Ctx;
-	HASH HA1;
-	
-	MD5Init(&Md5Ctx);
-	MD5Update(&Md5Ctx, pszUserName, strlen(pszUserName));
-	MD5Update(&Md5Ctx, ":", 1);
-	MD5Update(&Md5Ctx, pszRealm, strlen(pszRealm));
-	MD5Update(&Md5Ctx, ":", 1);
-	MD5Update(&Md5Ctx, pszPassword, strlen(pszPassword));
-	MD5Final(HA1, &Md5Ctx);
-	if (strcmp(pszAlg, "md5-sess") == 0) {
-		MD5Init(&Md5Ctx);
-		MD5Update(&Md5Ctx, HA1, HASHLEN);
-		MD5Update(&Md5Ctx, ":", 1);
-		MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
-		MD5Update(&Md5Ctx, ":", 1);
-		MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
-		MD5Final(HA1, &Md5Ctx);
-	};
-	CvtHex(HA1, SessionKey);
-}
-
-
-/* 
- * calculate request-digest/response-digest as per HTTP Digest spec 
- */
-void DigestCalcResponse(
-			HASHHEX HA1,                 /* H(A1) */
-			const char * pszNonce,       /* nonce from server */
-			const char * pszNonceCount,  /* 8 hex digits */
-			const char * pszCNonce,      /* client nonce */
-			const char * pszQop,         /* qop-value: "", "auth", "auth-int" */
-			const char * pszMethod,      /* method from the request */
-			const char * pszDigestUri,   /* requested URL */
-			HASHHEX HEntity,             /* H(entity body) if qop="auth-int" */
-			HASHHEX Response             /* request-digest or response-digest */)
-{
-	MD5_CTX Md5Ctx;
-	HASH HA2;
-	HASH RespHash;
-	HASHHEX HA2Hex;
-	
-	     /* calculate H(A2) */
-	MD5Init(&Md5Ctx);
-	MD5Update(&Md5Ctx, pszMethod, strlen(pszMethod));
-	MD5Update(&Md5Ctx, ":", 1);
-	MD5Update(&Md5Ctx, pszDigestUri, strlen(pszDigestUri));
-	if (strcmp(pszQop, "auth-int") == 0) {
-		MD5Update(&Md5Ctx, ":", 1);
-		MD5Update(&Md5Ctx, HEntity, HASHHEXLEN);
-	};
-	MD5Final(HA2, &Md5Ctx);
-	CvtHex(HA2, HA2Hex);
-	
-	     /* calculate response */
-	MD5Init(&Md5Ctx);
-	MD5Update(&Md5Ctx, HA1, HASHHEXLEN);
-	MD5Update(&Md5Ctx, ":", 1);
-	MD5Update(&Md5Ctx, pszNonce, strlen(pszNonce));
-	MD5Update(&Md5Ctx, ":", 1);
-	if (*pszQop) {
-		MD5Update(&Md5Ctx, pszNonceCount, strlen(pszNonceCount));
-		MD5Update(&Md5Ctx, ":", 1);
-		MD5Update(&Md5Ctx, pszCNonce, strlen(pszCNonce));
-		MD5Update(&Md5Ctx, ":", 1);
-		MD5Update(&Md5Ctx, pszQop, strlen(pszQop));
-		MD5Update(&Md5Ctx, ":", 1);
-	};
-	MD5Update(&Md5Ctx, HA2Hex, HASHHEXLEN);
-	MD5Final(RespHash, &Md5Ctx);
-	CvtHex(RespHash, Response);
-}
-

utils/gen_ha1/calc.h

@@ -1,62 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2001-2003 FhG Fokus
- *
- * This file is part of ser, a free SIP server.
- *
- * ser is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the ser software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#ifndef CALC_H
-#define CALC_H
-
-
-#define HASHLEN 16
-typedef char HASH[HASHLEN];
-
-
-#define HASHHEXLEN 32
-typedef char HASHHEX[HASHHEXLEN+1];
-
-
-void CvtHex(HASH Bin, HASHHEX Hex);
-
-/* 
- * calculate H(A1) as per HTTP Digest spec 
- */
-void DigestCalcHA1(const char * pszAlg, const char * pszUserName, const char * pszRealm,
-		   const char * pszPassword, const char * pszNonce, const char * pszCNonce,
-		   HASHHEX SessionKey);
-
-/* calculate request-digest/response-digest as per HTTP Digest spec */
-void DigestCalcResponse(HASHHEX HA1,           /* H(A1) */
-			const char * pszNonce,       /* nonce from server */
-			const char * pszNonceCount,  /* 8 hex digits */
-			const char * pszCNonce,      /* client nonce */
-			const char * pszQop,         /* qop-value: "", "auth", "auth-int" */
-			const char * pszMethod,      /* method from the request */
-			const char * pszDigestUri,   /* requested URL */
-			HASHHEX HEntity,       /* H(entity body) if qop="auth-int" */
-			HASHHEX Response      /* request-digest or response-digest */);
-
-
-#endif

utils/gen_ha1/gen_ha1.c

@@ -1,51 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2001-2003 FhG Fokus
- *
- * This file is part of ser, a free SIP server.
- *
- * ser is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version
- *
- * For a license to use the ser software under conditions
- * other than those described here, or to purchase support for this
- * software, please contact iptel.org by e-mail at the following addresses:
- *    [email protected]
- *
- * ser is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "../../md5global.h"
-#include "../../md5.h"
-#include "calc.h"
-
-
-
-int main(int argc, char** argv)
-{
-	HASHHEX ha1;
-
-	if (argc != 4) {
-		printf("Usage: gen_ha1 <username> <realm> <password> \n");
-		/* return EXIT_SUCCESS; -jku */
-		return 1;
-	}
-
-	DigestCalcHA1("md5", argv[1], argv[2], argv[3], "", "", ha1);
-	printf("%s\n", ha1);
-	
-	return 0; /* jku */
-}