pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/partysip Make partysip compilable with newer osip ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/472d741a22ea
branches: trunk
changeset: 533904:472d741a22ea
user: joerg <joerg%pkgsrc.org@localhost>
date: Sat Oct 06 00:00:01 2007 +0000
description:
Make partysip compilable with newer osip library versions.
diffstat:
net/partysip/distinfo | 16 ++++-
net/partysip/patches/patch-ac | 146 ++++++++++++++++++++++++++++++++++++++++++
net/partysip/patches/patch-ad | 19 +++++
net/partysip/patches/patch-ae | 54 +++++++++++++++
net/partysip/patches/patch-af | 66 ++++++++++++++++++
net/partysip/patches/patch-ag | 13 +++
net/partysip/patches/patch-ah | 34 +++++++++
net/partysip/patches/patch-ai | 13 +++
net/partysip/patches/patch-aj | 27 +++++++
net/partysip/patches/patch-ak | 13 +++
net/partysip/patches/patch-al | 40 +++++++++++
net/partysip/patches/patch-am | 48 +++++++++++++
net/partysip/patches/patch-an | 13 +++
net/partysip/patches/patch-ao | 13 +++
net/partysip/patches/patch-ap | 13 +++
15 files changed, 527 insertions(+), 1 deletions(-)
diffs (truncated from 594 to 300 lines):
diff -r 60dd76d2a5c0 -r 472d741a22ea net/partysip/distinfo
--- a/net/partysip/distinfo Fri Oct 05 23:35:11 2007 +0000
+++ b/net/partysip/distinfo Sat Oct 06 00:00:01 2007 +0000
@@ -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 -r 60dd76d2a5c0 -r 472d741a22ea net/partysip/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/partysip/patches/patch-ac Sat Oct 06 00:00:01 2007 +0000
@@ -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 -r 60dd76d2a5c0 -r 472d741a22ea net/partysip/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/partysip/patches/patch-ad Sat Oct 06 00:00:01 2007 +0000
@@ -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 -r 60dd76d2a5c0 -r 472d741a22ea net/partysip/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/partysip/patches/patch-ae Sat Oct 06 00:00:01 2007 +0000
@@ -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 -r 60dd76d2a5c0 -r 472d741a22ea net/partysip/patches/patch-af
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/partysip/patches/patch-af Sat Oct 06 00:00:01 2007 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index