Make partysip compilable with newer osip library versions.

15 files changed, 527 insertions, 1 deletions

diff --git a/net/partysip/distinfo b/net/partysip/distinfo
index 9ab720f25ec..35927e10860 100644
--- a/net/partysip/distinfo
+++ b/net/partysip/distinfo
@@ -1,7 +1,21 @@
-$NetBSD: distinfo,v 1.3 2005/09/16 15:24:23 drochner Exp $
+$NetBSD: distinfo,v 1.4 2007/10/06 00:00:01 joerg Exp $
 
 SHA1 (partysip-2.2.3.tar.gz) = 140e8fc1dc7df52e8f409babebbaf4fcabe213aa
 RMD160 (partysip-2.2.3.tar.gz) = 31f24803488a86b00711c924f4327564e960e3b2
 Size (partysip-2.2.3.tar.gz) = 568193 bytes
 SHA1 (patch-aa) = 2c8bd0c9f782e066d6d4433ade4cb5161a237a4f
 SHA1 (patch-ab) = d661caf4c229ba51ec98439ca089dc26e3cdb6e6
+SHA1 (patch-ac) = bd6a4755f40c861bfe92c99935868780797b4beb
+SHA1 (patch-ad) = 371540e95f2afd2724e7ad99e3222d131d099b5e
+SHA1 (patch-ae) = 2e7ee39803253d43b31caedb6f6e53a65d06c6db
+SHA1 (patch-af) = 69b22d5ff860f4bf72fd83c62d54493f45710a65
+SHA1 (patch-ag) = 11f2c5d50cda36490796944423695e076234e27f
+SHA1 (patch-ah) = db5013372c7050f2ede883ae0405ef0cc72a0663
+SHA1 (patch-ai) = 17f568b706e0500daec7212a7ccf142abbbaaf65
+SHA1 (patch-aj) = a30a2a92b9bab3bfb0f62ad6a2ed9a8e2c8af891
+SHA1 (patch-ak) = c5473c2681306b7c2a27a20cca80af9c8d87929e
+SHA1 (patch-al) = b843c4d71ab3f876e6ba459716f8deb05321a371
+SHA1 (patch-am) = 38307e4020f93b1c61f2c14e6c9a42c8ef426716
+SHA1 (patch-an) = d79eec0783bf4af04e50dc435cdab738542a16c2
+SHA1 (patch-ao) = 32f041e1c746ed91a472860ea3905f8ed1310244
+SHA1 (patch-ap) = 669dd1358795e10487c4baa73eb815e99cd8c132
diff --git a/net/partysip/patches/patch-ac b/net/partysip/patches/patch-ac
new file mode 100644
index 00000000000..2610a2f1af2
--- /dev/null
+++ b/net/partysip/patches/patch-ac
@@ -0,0 +1,146 @@
+$NetBSD: patch-ac,v 1.1 2007/10/06 00:00:01 joerg Exp $
+
+--- src/osip_msg.c.orig	2007-10-05 22:53:12.000000000 +0000
++++ src/osip_msg.c
+@@ -88,16 +88,16 @@ osip_msg_build_response (osip_message_t 
+     goto mcubr_error_1;
+ 
+   pos = 0;
+-  while (!osip_list_eol (request->vias, pos))
++  while (!osip_list_eol (&request->vias, pos))
+     {
+       osip_via_t *via;
+       osip_via_t *via2;
+ 
+-      via = (osip_via_t *) osip_list_get (request->vias, pos);
++      via = (osip_via_t *) osip_list_get (&request->vias, pos);
+       i = osip_via_clone (via, &via2);
+       if (i != -0)
+ 	goto mcubr_error_1;
+-      osip_list_add (response->vias, via2, -1);
++      osip_list_add (&response->vias, via2, -1);
+       pos++;
+     }
+ 
+@@ -119,7 +119,7 @@ osip_msg_build_response (osip_message_t 
+       HASHHEX ToTag;
+       osip_via_t *via;
+       osip_generic_param_t *br;
+-      via = (osip_via_t *)osip_list_get(request->vias,0);
++      via = (osip_via_t *)osip_list_get(&request->vias,0);
+       osip_via_param_get_byname (via, "branch", &br);
+       if (br==NULL || br->gvalue==NULL)
+ 	{
+@@ -197,14 +197,14 @@ osip_msg_build_response (osip_message_t 
+ 
+       /* copy all record-route values */
+       pos=0;
+-      while (!osip_list_eol(request->record_routes, pos))
++      while (!osip_list_eol(&request->record_routes, pos))
+ 	{
+ 	  osip_record_route_t *rr;
+ 	  osip_record_route_t *rr2;
+-	  rr = osip_list_get(request->record_routes, pos);
++	  rr = osip_list_get(&request->record_routes, pos);
+ 	  i = osip_record_route_clone(rr, &rr2);
+ 	  if (i!=0) return -1;
+-	  osip_list_add(response->record_routes, rr2, -1);
++	  osip_list_add(&response->record_routes, rr2, -1);
+ 	  pos++;
+ 	}
+     }
+@@ -230,13 +230,13 @@ osip_msg_sfp_build_response_osip_to_forw
+     return -1;
+ 
+   /* remove top via... and send */
+-  via = osip_list_get (fwd->vias, 0);
++  via = osip_list_get (&fwd->vias, 0);
+   if (via == NULL)		/* remote error: no via!! */
+     {
+       osip_message_free (fwd);
+       return -1;
+     }
+-  osip_list_remove (fwd->vias, 0);
++  osip_list_remove (&fwd->vias, 0);
+   osip_via_free (via);
+ 
+   if (core->banner[0]!='\0')
+@@ -350,7 +350,7 @@ _osip_message_set_topheader (osip_messag
+   else
+     h->hvalue = NULL;
+   sip->message_property = 2;
+-  osip_list_add (sip->headers, h, 0);
++  osip_list_add (&sip->headers, h, 0);
+   return 0;			/* ok */
+ }
+ 
+@@ -427,7 +427,7 @@ osip_msg_default_build_request_osip_to_f
+     via_set_port (via, osip_strdup (serverport));
+   via_set_protocol (via, osip_strdup ("UDP"));
+ 
+-  osip_list_add (fwd->vias, via, 0);
++  osip_list_add (&fwd->vias, via, 0);
+ 
+   /*        3.   Update the Max-Forwards header field */
+   osip_message_get_max_forwards (fwd, 0, &maxfwd);
+@@ -465,7 +465,7 @@ osip_msg_default_build_request_osip_to_f
+ 	  OSIP_TRACE (osip_trace
+ 		      (__FILE__, __LINE__, OSIP_INFO4, NULL,
+ 		       "I detect a route inserted by me, I remove it.\n"));
+-	  osip_list_remove (fwd->routes, 0);
++	  osip_list_remove (&fwd->routes, 0);
+ 	  osip_route_free (route);
+ 	}
+     }
+@@ -499,13 +499,13 @@ osip_msg_default_build_request_osip_to_f
+ 		      osip_strdup (psp_config_get_element ("magicstring2")));
+       osip_record_route_set_url (r_route, url_of_proxy);
+       /* insert above all other record-route */
+-      osip_list_add (fwd->record_routes, r_route, 0);
++      osip_list_add (&fwd->record_routes, r_route, 0);
+     }
+ 
+   /*        9.   Add a Content-Length header field if necessary */
+   if (fwd->content_length == NULL)
+     {
+-      if (osip_list_size (fwd->bodies) == 0)
++      if (osip_list_size (&fwd->bodies) == 0)
+ 	osip_message_set_content_length (fwd, "0");
+       /* else should be refused before... but I prefer to let
+          other deal with that */
+@@ -668,7 +668,7 @@ osip_msg_modify_ack_osip_to_be_forwarded
+     via_set_port (via, osip_strdup (serverport));
+   via_set_protocol (via, osip_strdup ("UDP"));
+ 
+-  osip_list_add (ack->vias, via, 0);
++  osip_list_add (&ack->vias, via, 0);
+ 
+   /*        3.   Update the Max-Forwards header field */
+   osip_message_get_max_forwards (ack, 0, &maxfwd);
+@@ -702,7 +702,7 @@ osip_msg_modify_ack_osip_to_be_forwarded
+ 	  OSIP_TRACE (osip_trace
+ 		      (__FILE__, __LINE__, OSIP_INFO4, NULL,
+ 		       "I detect a route inserted by me, I remove it.\n"));
+-	  osip_list_remove (ack->routes, 0);
++	  osip_list_remove (&ack->routes, 0);
+ 	  osip_route_free (route);
+ 	  /* in this case, we have previously requested to stay on the path.
+ 	     We don't want to change that decision now, so we override
+@@ -716,7 +716,7 @@ osip_msg_modify_ack_osip_to_be_forwarded
+   /*        9.   Add a Content-Length header field if necessary */
+   if (ack->content_length == NULL)
+     {
+-      if (osip_list_size (ack->bodies) == 0)
++      if (osip_list_size (&ack->bodies) == 0)
+ 	osip_message_set_content_length (ack, "0");
+       /* else should be refused before... but I prefer to let
+          other deal with that */
+@@ -779,7 +779,7 @@ osip_msg_build_cancel (osip_message_t **
+     i = osip_via_clone (via, &via2);
+     if (i != 0)
+       goto gc_error_1;
+-    osip_list_add (request->vias, via2, -1);
++    osip_list_add (&request->vias, via2, -1);
+   }
+ 
+   osip_message_set_content_length (request, "0");
diff --git a/net/partysip/patches/patch-ad b/net/partysip/patches/patch-ad
new file mode 100644
index 00000000000..38a63ed4699
--- /dev/null
+++ b/net/partysip/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2007/10/06 00:00:01 joerg Exp $
+
+--- src/psp_osip.c.orig	2007-10-05 22:56:33.000000000 +0000
++++ src/psp_osip.c
+@@ -300,10 +300,10 @@ psp_osip_free (psp_osip_t * psp_osip)
+     }
+ 
+   /* now it's time to free all transactions... */
+-  _osip_kill_transaction (psp_osip->osip->osip_ict_transactions);
+-  _osip_kill_transaction (psp_osip->osip->osip_nict_transactions);
+-  _osip_kill_transaction (psp_osip->osip->osip_ist_transactions);
+-  _osip_kill_transaction (psp_osip->osip->osip_nist_transactions);
++  _osip_kill_transaction (&psp_osip->osip->osip_ict_transactions);
++  _osip_kill_transaction (&psp_osip->osip->osip_nict_transactions);
++  _osip_kill_transaction (&psp_osip->osip->osip_ist_transactions);
++  _osip_kill_transaction (&psp_osip->osip->osip_nist_transactions);
+ 
+   i = ppl_pipe_close (psp_osip->wakeup);
+   if (i == -1)
diff --git a/net/partysip/patches/patch-ae b/net/partysip/patches/patch-ae
new file mode 100644
index 00000000000..e58835363ae
--- /dev/null
+++ b/net/partysip/patches/patch-ae
@@ -0,0 +1,54 @@
+$NetBSD: patch-ae,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- src/psp_core.c.orig	2007-10-05 22:58:08.000000000 +0000
++++ src/psp_core.c
+@@ -939,7 +939,7 @@ psp_core_default_generate_branch_for_req
+ {
+   osip_via_t *via;
+   osip_generic_param_t *b;
+-  via = osip_list_get (request->vias, 0);
++  via = osip_list_get (&request->vias, 0);
+   osip_via_param_get_byname (via, "branch", &b);
+   if (b != NULL && 0 == strncmp ("z9hG4bK", b->gvalue, 7))
+     {
+@@ -1327,7 +1327,7 @@ psp_core_cb_snd_message (osip_transactio
+       osip_generic_param_t *maddr;
+       osip_generic_param_t *received;
+       osip_generic_param_t *rport;
+-      via = osip_list_get (sip->vias, 0);
++      via = osip_list_get (&sip->vias, 0);
+       if (via == NULL)
+ 	return -2;
+       osip_via_param_get_byname (via, "maddr", &maddr);
+@@ -1383,7 +1383,7 @@ PPL_DECLARE (int) psp_core_fix_strict_ro
+     return 0;
+ 
+   osip_uri_uparam_get_byname (evt->sip->req_uri, "psp", &psp_param);
+-  if (psp_param != NULL && !osip_list_eol (evt->sip->routes, 0))
++  if (psp_param != NULL && !osip_list_eol (&evt->sip->routes, 0))
+     {				/* !! strict rooter detected! (compliant with old draft...)
+ 				   We have to rewrite the request-uri and routes */
+       osip_route_t *route;
+@@ -1398,11 +1398,11 @@ PPL_DECLARE (int) psp_core_fix_strict_ro
+ 	  osip_uri_t *oldurl;
+ 
+ 	  pos = 0;
+-	  while (!osip_list_eol (evt->sip->routes, pos))
++	  while (!osip_list_eol (&evt->sip->routes, pos))
+ 	    pos++;
+ 	  pos--;
+ 	  osip_message_get_route (evt->sip, pos, &route);
+-	  osip_list_remove (evt->sip->routes, pos);
++	  osip_list_remove (&evt->sip->routes, pos);
+ 	  oldurl = evt->sip->req_uri;
+ 
+ 	  evt->sip->req_uri = route->url;
+@@ -1413,7 +1413,7 @@ PPL_DECLARE (int) psp_core_fix_strict_ro
+ 	  if (i != 0)
+ 	    return -1;
+ 	  route->url = oldurl;
+-	  osip_list_add (evt->sip->routes, route, 0);
++	  osip_list_add (&evt->sip->routes, route, 0);
+ 	}
+     }
+   /* request is now compliant to the latest draft :-) */
diff --git a/net/partysip/patches/patch-af b/net/partysip/patches/patch-af
new file mode 100644
index 00000000000..abaef9fd3b7
--- /dev/null
+++ b/net/partysip/patches/patch-af
@@ -0,0 +1,66 @@
+$NetBSD: patch-af,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- src/psp_nat.c.orig	2007-10-05 23:00:16.000000000 +0000
++++ src/psp_nat.c
+@@ -472,7 +472,7 @@ firewall_modify_200ok_validate_condition
+   osip_generic_param_t *maddr;
+   osip_generic_param_t *received;
+   osip_generic_param_t *rport;
+-  via = osip_list_get (response->vias, 0);
++  via = osip_list_get (&response->vias, 0);
+   if (via == NULL)
+     return -1;
+   osip_via_param_get_byname (via, "maddr", &maddr);
+@@ -586,7 +586,7 @@ firewall_fix_200ok_osip_to_forward (osip
+     return 1;
+ 
+   i = -1;
+-  for (pos_body = 0; !osip_list_eol (response->bodies, pos_body); pos_body++)
++  for (pos_body = 0; !osip_list_eol (&response->bodies, pos_body); pos_body++)
+     {
+       sdp = NULL;
+       i = osip_message_get_body (response, pos_body, &body);
+@@ -665,14 +665,14 @@ firewall_fix_200ok_osip_to_forward (osip
+       sdp->c_connection->c_addr = osip_strdup (core->ext_ip);
+     }
+ 
+-  for (i = 0; !osip_list_eol (sdp->m_medias, i); i++)
++  for (i = 0; !osip_list_eol (&sdp->m_medias, i); i++)
+     {
+-      med = (sdp_media_t *) osip_list_get (sdp->m_medias, i);
++      med = (sdp_media_t *) osip_list_get (&sdp->m_medias, i);
+       if (med->m_media != NULL)
+ 	{
+ 	  sdp_connection_t *conn;
+ 	  char *fw_port;
+-	  conn = (sdp_connection_t *) osip_list_get (sdp->m_medias, i);
++	  conn = (sdp_connection_t *) osip_list_get (&sdp->m_medias, i);
+ 	  fw_port = med->m_port;
+ 	  if (conn != NULL && conn->c_addr!=NULL)
+ 	    {
+@@ -750,7 +750,7 @@ firewall_fix_request_osip_to_forward (os
+     return 1;
+ 
+   i = -1;
+-  for (pos_body = 0; !osip_list_eol (invite->bodies, pos_body); pos_body++)
++  for (pos_body = 0; !osip_list_eol (&invite->bodies, pos_body); pos_body++)
+     {
+       sdp = NULL;
+       i = osip_message_get_body (invite, pos_body, &body);
+@@ -828,13 +828,13 @@ firewall_fix_request_osip_to_forward (os
+       sdp->c_connection->c_addr = osip_strdup (core->ext_ip);
+     }
+ 
+-  for (i = 0; !osip_list_eol (sdp->m_medias, i); i++)
++  for (i = 0; !osip_list_eol (&sdp->m_medias, i); i++)
+     {
+-      med = (sdp_media_t *) osip_list_get (sdp->m_medias, i);
++      med = (sdp_media_t *) osip_list_get (&sdp->m_medias, i);
+       if (med->m_media != NULL)	{
+ 	  sdp_connection_t *conn;
+ 	  char *fw_port;
+-	  conn = (sdp_connection_t *) osip_list_get (sdp->m_medias, i);
++	  conn = (sdp_connection_t *) osip_list_get (&sdp->m_medias, i);
+ 	  fw_port = med->m_port;
+ 	  if (conn != NULL && conn->c_addr!=NULL)
+ 	    {
diff --git a/net/partysip/patches/patch-ag b/net/partysip/patches/patch-ag
new file mode 100644
index 00000000000..b1bd52f9b00
--- /dev/null
+++ b/net/partysip/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- src/sfp.c.orig	2007-10-05 23:02:02.000000000 +0000
++++ src/sfp.c
+@@ -539,7 +539,7 @@ cancel_match_invite (osip_transaction_t 
+   osip_via_t *via;
+ 
+   osip_via_param_get_byname (invite->topvia, "branch", &br);
+-  via = osip_list_get (cancel->vias, 0);
++  via = osip_list_get (&cancel->vias, 0);
+   if (via == NULL)
+     return -1;			/* request without via??? */
+   osip_via_param_get_byname (via, "branch", &br2);
diff --git a/net/partysip/patches/patch-ah b/net/partysip/patches/patch-ah
new file mode 100644
index 00000000000..93f41072ba0
--- /dev/null
+++ b/net/partysip/patches/patch-ah
@@ -0,0 +1,34 @@
+$NetBSD: patch-ah,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- src/sfp_fsm2.c.orig	2007-10-05 23:02:33.000000000 +0000
++++ src/sfp_fsm2.c
+@@ -312,9 +312,9 @@ sfp_cancel_pending_branch(psp_request_t 
+ 
+   /* add the same route-set than in the previous request */
+   pos=0;
+-  while (!osip_list_eol (br->out_tr->orig_request->routes, pos))
++  while (!osip_list_eol (&br->out_tr->orig_request->routes, pos))
+     {
+-      route = (osip_route_t *) osip_list_get (br->out_tr->orig_request->routes, pos);
++      route = (osip_route_t *) osip_list_get (&br->out_tr->orig_request->routes, pos);
+       i = osip_route_clone (route, &route2);
+       if (i != 0)
+ 	{
+@@ -324,7 +324,7 @@ sfp_cancel_pending_branch(psp_request_t 
+ 	  osip_message_free(cancel);
+ 	  return -1;
+ 	}
+-      osip_list_add(cancel->routes, route2, -1);
++      osip_list_add(&cancel->routes, route2, -1);
+       pos++;
+     }
+ 
+@@ -503,7 +503,7 @@ sfp_answer_request(psp_request_t * req)
+ 		}
+ 	    }
+ 	}
+-      if (osip_list_size (response->contacts) == 0)
++      if (osip_list_size (&response->contacts) == 0)
+ 	{
+ 	  OSIP_TRACE (osip_trace
+ 		      (__FILE__, __LINE__, OSIP_ERROR, NULL,
diff --git a/net/partysip/patches/patch-ai b/net/partysip/patches/patch-ai
new file mode 100644
index 00000000000..f1798020dcd
--- /dev/null
+++ b/net/partysip/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- plugin/udp/udp.c.orig	2007-10-05 23:03:41.000000000 +0000
++++ plugin/udp/udp.c
+@@ -633,7 +633,7 @@ __osip_message_fix_last_via_header (osip
+   if (MSG_IS_RESPONSE (request))
+     return 0;			/* Don't fix Via header */
+ 
+-  via = osip_list_get (request->vias, 0);
++  via = osip_list_get (&request->vias, 0);
+   if (via == NULL || via->host == NULL)
+     /* Hey, we could build it? */
+     return -1;
diff --git a/net/partysip/patches/patch-aj b/net/partysip/patches/patch-aj
new file mode 100644
index 00000000000..790b99bd08e
--- /dev/null
+++ b/net/partysip/patches/patch-aj
@@ -0,0 +1,27 @@
+$NetBSD: patch-aj,v 1.1 2007/10/06 00:00:02 joerg Exp $
+
+--- plugin/syntax/syntax.c.orig	2007-10-05 23:04:37.000000000 +0000
++++ plugin/syntax/syntax.c
+@@ -211,11 +211,11 @@ cb_check_syntax_in_request (psp_request_
+ 
+   }
+ 
+-  if (!osip_list_eol(request->vias, 1)) /* only one via? */
++  if (!osip_list_eol(&request->vias, 1)) /* only one via? */
+     {
+       i=0;
+       spiral=0;
+-      for (;!osip_list_eol(request->vias, i);i++)
++      for (;!osip_list_eol(&request->vias, i);i++)
+ 	{
+ 	  osip_via_t *via;
+ 	  osip_message_get_via (request, i, &via);
+@@ -313,7 +313,7 @@ cb_complete_answer_on_4xx (psp_request_t
+ 	    break;
+ 	  osip_free (unsupported->hname);
+ 	  unsupported->hname = osip_strdup ("Unsupported");
+-	  osip_list_add (response->headers, unsupported, -1);
++	  osip_list_add (&response->headers, unsupported, -1);
+ 	  pos++;
+ 	  pos = osip_message_get_proxy_require (request, pos, &p_require);
+ 	}
diff --git a/net/partysip/patches/patch-ak b/net/partysip/patches/patch-ak
new file mode 100644
index 00000000000..d8b2a2e460a
--- /dev/null
+++ b/net/partysip/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/filter/filter.c.orig	2007-10-05 23:05:28.000000000 +0000
++++ plugin/filter/filter.c
+@@ -461,7 +461,7 @@ int cb_filter_search_location(psp_reques
+     }
+ 
+   i=0;
+-  for (;!osip_list_eol(request->routes, i);i++)
++  for (;!osip_list_eol(&request->routes, i);i++)
+     {
+       osip_message_get_route (request, i, &route);
+       if (0 != psp_core_is_responsible_for_this_route(route->url))
diff --git a/net/partysip/patches/patch-al b/net/partysip/patches/patch-al
new file mode 100644
index 00000000000..5b47bcc036d
--- /dev/null
+++ b/net/partysip/patches/patch-al
@@ -0,0 +1,40 @@
+$NetBSD: patch-al,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/auth/auth.c.orig	2007-10-05 23:05:58.000000000 +0000
++++ plugin/auth/auth.c
+@@ -244,7 +244,7 @@ cb_auth_validate_credentials (psp_reques
+ 
+ 		  psp_request_set_state (psp_req, PSP_CONTINUE);
+ 		  /* remove the proxy_authorization header! */
+-		  osip_list_remove (request->proxy_authorizations, pos);
++		  osip_list_remove (&request->proxy_authorizations, pos);
+ 		  osip_proxy_authorization_free (p_auth);
+ 
+ 		  OSIP_TRACE (osip_trace
+@@ -301,7 +301,7 @@ cb_auth_validate_credentials (psp_reques
+ 		}
+ 
+ 	      /* remove the authorization header! */
+-	      osip_list_remove (request->authorizations, pos);
++	      osip_list_remove (&request->authorizations, pos);
+ 	      osip_authorization_free (h_auth);
+ 
+ 	      OSIP_TRACE (osip_trace (__FILE__, __LINE__, OSIP_INFO4, NULL,
+@@ -433,7 +433,7 @@ cb_auth_add_credentials (psp_request_t *
+ 	    }
+ 	}
+ 
+-	osip_list_add (response->proxy_authenticates, p_auth, -1);
++	osip_list_add (&response->proxy_authenticates, p_auth, -1);
+ 
+ 	psp_request_set_state (psp_req, PSP_CONTINUE);
+ 	return 0;
+@@ -449,7 +449,7 @@ cb_auth_add_credentials (psp_request_t *
+ 	osip_www_authenticate_set_opaque (w_auth, opaque);
+ 	osip_www_authenticate_set_realm (w_auth, realm);
+ 
+-	osip_list_add (response->www_authenticates, w_auth, -1);
++	osip_list_add (&response->www_authenticates, w_auth, -1);
+ 
+ 	psp_request_set_state (psp_req, PSP_CONTINUE);
+ 	return 0;
diff --git a/net/partysip/patches/patch-am b/net/partysip/patches/patch-am
new file mode 100644
index 00000000000..12d5a8651eb
--- /dev/null
+++ b/net/partysip/patches/patch-am
@@ -0,0 +1,48 @@
+$NetBSD: patch-am,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/rgstrar/rgstrar.c.orig	2007-10-05 23:06:51.000000000 +0000
++++ plugin/rgstrar/rgstrar.c
+@@ -142,9 +142,9 @@ cb_rgstrar_update_contact_list (psp_requ
+       }
+ 
+     pos = 0;
+-    while (!osip_list_eol (request->contacts, pos))
++    while (!osip_list_eol (&request->contacts, pos))
+       {
+-	co = osip_list_get (request->contacts, pos);
++	co = osip_list_get (&request->contacts, pos);
+ 	if (*path=='\0')
+ 	  i = ppl_uinfo_add_binding_with_path (user, co, expires, NULL);
+ 	else
+@@ -206,7 +206,7 @@ cb_rgstrar_add_contacts_in_register (psp
+ 	  return -2;
+ 	}
+ 
+-      co = osip_list_get (request->contacts, 0);
++      co = osip_list_get (&request->contacts, 0);
+       if (co != NULL && co->displayname != NULL)
+ 	{
+ 	  if (0 == strcmp (co->displayname, "*"))
+@@ -244,7 +244,7 @@ cb_rgstrar_add_contacts_in_register (psp
+ 		  ppl_uinfo_store_bindings(user);
+ 		  return -1;	/* ask the core application to discard the request */
+ 		}
+-	      osip_list_add (response->contacts, co2, -1);
++	      osip_list_add (&response->contacts, co2, -1);
+ 	    }
+ 	}
+ 
+@@ -256,11 +256,11 @@ cb_rgstrar_add_contacts_in_register (psp
+ 	  int pos;
+ 
+ 	  pos = 0;
+-	  while (!osip_list_eol (response->contacts, pos))
++	  while (!osip_list_eol (&response->contacts, pos))
+ 	    {
+ 	      osip_generic_param_t *exp;
+ 
+-	      co = osip_list_get (response->contacts, pos);
++	      co = osip_list_get (&response->contacts, pos);
+               i = osip_contact_param_get_byname (co, "expires", &exp);
+ 	      if (exp == NULL)	/* at least, on expire is missing */
+ 		{
diff --git a/net/partysip/patches/patch-an b/net/partysip/patches/patch-an
new file mode 100644
index 00000000000..a99cfc99f2f
--- /dev/null
+++ b/net/partysip/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/ls_static/ls_static.c.orig	2007-10-05 23:09:13.000000000 +0000
++++ plugin/ls_static/ls_static.c
+@@ -284,7 +284,7 @@ cb_ls_static_search_location (psp_reques
+     }
+ 
+   i = 0;
+-  for (; !osip_list_eol (request->routes, i); i++)
++  for (; !osip_list_eol (&request->routes, i); i++)
+     {
+       osip_message_get_route (request, i, &route);
+       if (0 != psp_core_is_responsible_for_this_route (route->url))
diff --git a/net/partysip/patches/patch-ao b/net/partysip/patches/patch-ao
new file mode 100644
index 00000000000..dc5b75ac106
--- /dev/null
+++ b/net/partysip/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/ls_sfull/ls_sfull.c.orig	2007-10-05 23:09:57.000000000 +0000
++++ plugin/ls_sfull/ls_sfull.c
+@@ -149,7 +149,7 @@ cb_ls_sfull_search_location (psp_request
+   psp_request_set_state (psp_req, PSP_MANDATE);
+ 
+   i = 0;
+-  for (; !osip_list_eol (request->routes, i); i++)
++  for (; !osip_list_eol (&request->routes, i); i++)
+     {
+       osip_message_get_route (request, i, &route);
+       if (0 != psp_core_is_responsible_for_this_route (route->url))
diff --git a/net/partysip/patches/patch-ap b/net/partysip/patches/patch-ap
new file mode 100644
index 00000000000..5c9a32f2b03
--- /dev/null
+++ b/net/partysip/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2007/10/06 00:00:03 joerg Exp $
+
+--- plugin/groups/groups.c.orig	2007-10-05 23:10:29.000000000 +0000
++++ plugin/groups/groups.c
+@@ -358,7 +358,7 @@ int cb_groups_search_location(psp_reques
+   psp_request_set_mode(psp_req, PSP_SFULL_MODE);
+ 
+   i=0;
+-  for (;!osip_list_eol(request->routes, i);i++)
++  for (;!osip_list_eol(&request->routes, i);i++)
+     {
+       osip_message_get_route (request, i, &route);
+       if (0 != psp_core_is_responsible_for_this_route(route->url))