[Pkg-voip-commits] r5282 - in /yxa/trunk/debian: changelog patches/00list patches/eventserver_for_package.dpatch patches/ipv6_v6only.dpatch
mikma-guest at alioth.debian.org
mikma-guest at alioth.debian.org
Tue Mar 11 19:41:01 UTC 2008
Author: mikma-guest
Date: Tue Mar 11 19:41:01 2008
New Revision: 5282
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5282
Log:
* Enable IPV6_V6ONLY on IPv6 sockets.
* Fix bug in "eventserver_for_package".
Added:
yxa/trunk/debian/patches/eventserver_for_package.dpatch (with props)
yxa/trunk/debian/patches/ipv6_v6only.dpatch (with props)
Modified:
yxa/trunk/debian/changelog
yxa/trunk/debian/patches/00list
Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=5282&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Tue Mar 11 19:41:01 2008
@@ -3,6 +3,8 @@
* Auto-detect SSL-PKIX.hrl renamed to OTP-PKIX.hrl in OTP R12B-0.
* Replace all use of httpd_util:to_lower/1, to_upper/1, and
httpd_util:encode_base64/1 (removed in OTP R12B-0).
+ * Enable IPV6_V6ONLY on IPv6 sockets.
+ * Fix bug in "eventserver_for_package".
- -- Mikael Magnusson <mikma at users.sourceforge.net> Sat, 08 Dec 2007 12:38:00 +0100
+ -- Mikael Magnusson <mikma at users.sourceforge.net> Tue, 11 Mar 2008 20:37:06 +0100
Modified: yxa/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/00list?rev=5282&op=diff
==============================================================================
--- yxa/trunk/debian/patches/00list (original)
+++ yxa/trunk/debian/patches/00list Tue Mar 11 19:41:01 2008
@@ -9,3 +9,4 @@
to_lower
ssl_util
eventserver_for_package
+ipv6_v6only
Added: yxa/trunk/debian/patches/eventserver_for_package.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/eventserver_for_package.dpatch?rev=5282&op=file
==============================================================================
--- yxa/trunk/debian/patches/eventserver_for_package.dpatch (added)
+++ yxa/trunk/debian/patches/eventserver_for_package.dpatch Tue Mar 11 19:41:01 2008
@@ -1,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## eventserver_for_package.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Bugfix, forward URL need to be parsed before returned.
+
+ at DPATCH@
+diff -urNad yxa-1.0~/src/incomingproxy.erl yxa-1.0/src/incomingproxy.erl
+--- yxa-1.0~/src/incomingproxy.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/incomingproxy.erl 2007-12-08 00:28:09.000000000 +0100
+@@ -435,7 +435,7 @@
+
+ case lists:keysearch(EventPackage, 1, EventDstL) of
+ {value, {EventPackage, URL}} ->
+- {forward, URL};
++ {forward, sipurl:parse(URL)};
+ false ->
+ %% use default eventserver parameter since we found no
+ %% match for this specific EventPackage
Propchange: yxa/trunk/debian/patches/eventserver_for_package.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: yxa/trunk/debian/patches/ipv6_v6only.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/ipv6_v6only.dpatch?rev=5282&op=file
==============================================================================
--- yxa/trunk/debian/patches/ipv6_v6only.dpatch (added)
+++ yxa/trunk/debian/patches/ipv6_v6only.dpatch Tue Mar 11 19:41:01 2008
@@ -1,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ipv6_v6only.dpatch by <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable IPV6_V6ONLY on IPv6 sockets. Yxa doesn't work if it's
+## DP: disabled.
+
+ at DPATCH@
+diff -urNad yxa-1.0~/src/transportlayer/sipsocket_udp.erl yxa-1.0/src/transportlayer/sipsocket_udp.erl
+--- yxa-1.0~/src/transportlayer/sipsocket_udp.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/transportlayer/sipsocket_udp.erl 2008-03-10 20:35:40.000000000 +0100
+@@ -75,6 +75,8 @@
+ %% v6 sockets have a default receive buffer size of 1k in Erlang R9C-0
+ -define(SOCKETOPTSv6, [{reuseaddr, true}, binary, inet6, {buffer, 8 * 1024}]).
+
++-define(IPPROTO_IPV6, 41).
++-define(IPV6_V6ONLY, 26).
+
+ %%====================================================================
+ %% External functions
+@@ -171,7 +173,11 @@
+ {stop, "Could not open UDP socket"}
+ end;
+ start_listening([{udp6, IP, Port} | T], State) when is_integer(Port), is_record(State, state) ->
+- SocketOpts = [{ip, IP} | ?SOCKETOPTSv6],
++ SocketOpts0 = [{ip, IP} | ?SOCKETOPTSv6],
++ SocketOpts = case os:type() of
++ {unix,linux} -> [{raw, ?IPPROTO_IPV6, ?IPV6_V6ONLY, <<1:32/native>>} | SocketOpts0]
++% _ -> SocketOpts0
++ end,
+ case gen_udp:open(Port, SocketOpts) of
+ {ok, Socket} ->
+ HostPort1 = get_localaddr(Socket, "[::]"),
+diff -urNad yxa-1.0~/src/transportlayer/tcp_listener.erl yxa-1.0/src/transportlayer/tcp_listener.erl
+--- yxa-1.0~/src/transportlayer/tcp_listener.erl 2007-10-17 16:41:21.000000000 +0200
++++ yxa-1.0/src/transportlayer/tcp_listener.erl 2008-03-10 20:35:40.000000000 +0100
+@@ -55,6 +55,8 @@
+ -define(SOCKETOPTS, [binary, {packet, 0}, {active, false}, {reuseaddr, true}]).
+ %% The ssl module does not support reuseaddr
+ -define(SSL_SOCKETOPTS, [binary, {packet, 0}, {active, once}, {nodelay, true}]).
++-define(IPPROTO_IPV6, 41).
++-define(IPV6_V6ONLY, 26).
+
+
+ %%====================================================================
+@@ -335,7 +337,11 @@
+ This = [inet, {ip, IPtuple}],
+ {ok, inet, gen_tcp, This ++ ?SOCKETOPTS};
+ get_settings(tcp6, IPtuple) ->
+- This = [inet6, {ip, IPtuple}],
++ This0 = [inet6, {ip, IPtuple}],
++ This = case os:type() of
++ {unix,linux} -> [{raw, ?IPPROTO_IPV6, ?IPV6_V6ONLY, <<1:32/native>>} | This0];
++ _ -> This0
++ end,
+ {ok, inet, gen_tcp, This ++ ?SOCKETOPTS};
+ get_settings(tls, IPtuple) ->
+ L = get_settings_tls(),
Propchange: yxa/trunk/debian/patches/ipv6_v6only.dpatch
------------------------------------------------------------------------------
svn:executable = *
More information about the Pkg-voip-commits
mailing list