sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:master: lib/srdb1/schema: replaced lcr schema files

by Juha Heinanen

Module: sip-router Branch: master Commit: eabca5c0e74a0c2707bba439815c9ebd9670b0d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eabca5c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Jun 10 13:32:35 2010 +0300 lib/srdb1/schema: replaced lcr schema files - Replaced lcr and gw schema files with lcr_rule, lcr_rule_target and lcr_gw schema files. --- lib/srdb1/schema/{gw.xml => lcr_gw.xml} | 41 ++++------------ lib/srdb1/schema/{lcr.xml => lcr_rule.xml} | 34 ++++++++------ lib/srdb1/schema/{lcr.xml => lcr_rule_target.xml} | 52 +++++++++++---------- 3 files changed, 58 insertions(+), 69 deletions(-) diff --git a/lib/srdb1/schema/gw.xml b/lib/srdb1/schema/lcr_gw.xml similarity index 75% rename from lib/srdb1/schema/gw.xml rename to lib/srdb1/schema/lcr_gw.xml index 3d92ae8..5f0f4e2 100644 --- a/lib/srdb1/schema/gw.xml +++ b/lib/srdb1/schema/lcr_gw.xml @@ -8,12 +8,13 @@ ]> -<table id="gw" xmlns:db="http://docbook.org/ns/docbook"> - <name>gw</name> - <version>11</version> +<table id="lcr_gw" xmlns:db="http://docbook.org/ns/docbook"> + <name>lcr_gw</name> + <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table contains Least Cost Routing Gateway definitions for the LCR module. + <db:para>This table is used by lcr (Least Cost Routing) module + to store gateway attributes. More information can be found at: &KAMAILIO_MOD_DOC;lcr.html. </db:para> </description> @@ -37,16 +38,11 @@ <name>gw_name</name> <type>string</type> <size>128</size> - <description>Name of the gateway</description> + <null/> + <description>Name of the gateway (for documentation only)</description> <natural/> </column> - <column id="grp_id"> - <name>grp_id</name> - <type>unsigned int</type> - <description>ID of gateway's group</description> - </column> - <column id="ip_addr"> <name>ip_addr</name> <type>string</type> @@ -89,7 +85,7 @@ <name>transport</name> <type>unsigned char</type> <null/> - <description>Transport type to be used for the gateway</description> + <description>Transport protocol to be used for the gateway</description> </column> <column id="strip"> @@ -108,13 +104,6 @@ <description>Request URI user part tag</description> </column> - <column id="weight"> - <name>weight</name> - <type>unsigned int</type> - <null/> - <description>Weight of gateway within gw_grp. Valid values are 1-254.</description> - </column> - <column id="flags"> <name>flags</name> <type>unsigned int</type> @@ -127,22 +116,14 @@ <type>unsigned int</type> <null/> <default><null/></default> - <description>If not null, contains unix timestamp telling when gw becomes operational.</description> + <description>If not null, contains unix timestamp telling when gw becomes operational</description> </column> <index> - <name>lcr_id_grp_id_gw_name_idx</name> - <colref linkend="lcr_id"/> - <colref linkend="grp_id"/> - <colref linkend="gw_name"/> - <unique/> - </index> - - <index> - <name>lcr_id_grp_id_ip_addr_hostname_idx</name> + <name>lcr_id_ip_addr_port_hostname_idx</name> <colref linkend="lcr_id"/> - <colref linkend="grp_id"/> <colref linkend="ip_addr"/> + <colref linkend="port"/> <colref linkend="hostname"/> <unique/> </index> diff --git a/lib/srdb1/schema/lcr.xml b/lib/srdb1/schema/lcr_rule.xml similarity index 66% copy from lib/srdb1/schema/lcr.xml copy to lib/srdb1/schema/lcr_rule.xml index a2f055c..6ffc6db 100644 --- a/lib/srdb1/schema/lcr.xml +++ b/lib/srdb1/schema/lcr_rule.xml @@ -7,12 +7,13 @@ ]> -<table id="lcr" xmlns:db="http://docbook.org/ns/docbook"> - <name>lcr</name> - <version>3</version> +<table id="lcr_rule" xmlns:db="http://docbook.org/ns/docbook"> + <name>lcr_rule</name> + <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the lcr (Least Cost Routing) rules. + <db:para>This table is used by the lcr (Least Cost Routing) + module to store routing rules. More information can be found at: &KAMAILIO_MOD_DOC;lcr.html. </db:para> </description> @@ -36,7 +37,7 @@ <name>prefix</name> <type>string</type> <size>16</size> - <null/> + <null/> <default><null/></default> <description>Prefix of Request URI user part</description> <natural/> @@ -48,24 +49,29 @@ <size>&domain_len;</size> <null/> <default><null/></default> - <description>Pattern that is matched to caller's URI</description> + <description>PCRE regular expression that is matched to caller's URI</description> </column> - <column id="grp_id"> - <name>grp_id</name> + <column id="stopper"> + <name>stopper</name> <type>unsigned int</type> - <description>Group ID</description> + <default>0</default> + <description>Tells if rule is "stopper" rule</description> </column> - <column> - <name>priority</name> - <type>unsigned char</type> - <description>Priority</description> + <column id="enabled"> + <name>enabled</name> + <type>unsigned int</type> + <default>1</default> + <description>Tells if rule is enabled</description> </column> <index> - <name>lcr_id_idx</name> + <name>lcr_id_prefix_from_uri_idx</name> <colref linkend="lcr_id"/> + <colref linkend="prefix"/> + <colref linkend="from_uri"/> + <unique/> </index> </table> diff --git a/lib/srdb1/schema/lcr.xml b/lib/srdb1/schema/lcr_rule_target.xml similarity index 57% rename from lib/srdb1/schema/lcr.xml rename to lib/srdb1/schema/lcr_rule_target.xml index a2f055c..6cfcf41 100644 --- a/lib/srdb1/schema/lcr.xml +++ b/lib/srdb1/schema/lcr_rule_target.xml @@ -7,12 +7,13 @@ ]> -<table id="lcr" xmlns:db="http://docbook.org/ns/docbook"> - <name>lcr</name> - <version>3</version> +<table id="lcr_rule_target" xmlns:db="http://docbook.org/ns/docbook"> + <name>lcr_rule_target</name> + <version>1</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> - <db:para>This table is used by the lcr (Least Cost Routing) rules. + <db:para>This table is used by the lcr (Least Cost Routing) + module to store routing rule targets. More information can be found at: &KAMAILIO_MOD_DOC;lcr.html. </db:para> </description> @@ -32,37 +33,38 @@ <description>LCR instance identifier</description> </column> - <column id="prefix"> - <name>prefix</name> - <type>string</type> - <size>16</size> - <null/> - <default><null/></default> - <description>Prefix of Request URI user part</description> - <natural/> - </column> - - <column id="from_uri"> - <name>from_uri</name> - <type>string</type> - <size>&domain_len;</size> - <null/> - <default><null/></default> - <description>Pattern that is matched to caller's URI</description> + <column id="rule_id"> + <name>rule_id</name> + <type>unsigned int</type> + <description>Identifies a rule in lcr_rule table</description> </column> - <column id="grp_id"> - <name>grp_id</name> + <column id="gw_id"> + <name>gw_id</name> <type>unsigned int</type> - <description>Group ID</description> + <description>Identifies a gateway in lcr_gw table</description> </column> <column> <name>priority</name> <type>unsigned char</type> - <description>Priority</description> + <description>Priority of this target (0-255)</description> </column> + <column id="weight"> + <name>weight</name> + <type>unsigned int</type> + <default>1</default> + <description>Weight of this target (1-254)</description> + </column> + + <index> + <name>rule_id_gw_id_idx</name> + <colref linkend="rule_id"/> + <colref linkend="gw_id"/> + <unique/> + </index> + <index> <name>lcr_id_idx</name> <colref linkend="lcr_id"/>

13 years, 11 months

git:master: modules/lcr: major rewrite

by Juha Heinanen

Module: sip-router Branch: master Commit: 550db5cb1599619a285144cc14677b89eefcf33b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=550db5c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Thu Jun 10 13:05:05 2010 +0300 modules/lcr: major rewrite - For easier management, information is now kept in three tables: lcr_rule, lcr_rule_target, and lcr_gw. - For simplicity, gateway groups are not anymore supported. - Added possibility to stop trying to match shorter prefixes, when a matching prefix is found. - Stripping and tagging can be controlled by a flag. - New database schema and upgrade script will be provided later today. --- modules/lcr/README | 596 ++++++++++------- modules/lcr/doc/lcr_admin.xml | 423 ++++++++---- modules/lcr/hash.c | 168 ++++-- modules/lcr/hash.h | 30 +- modules/lcr/lcr_mod.c | 1507 ++++++++++++++++++++++------------------- modules/lcr/lcr_mod.h | 56 +- modules/lcr/lcr_rpc.c | 235 ++++--- modules/lcr/lcr_rpc.h | 12 +- 8 files changed, 1753 insertions(+), 1274 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=550…

13 years, 11 months

git:andrei/raw_sock: raw sockets: get dst. ip from the ip header

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: fb20a055a029198cbc9dd5c755c3806fbb1e80cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fb20a05… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 9 22:58:55 2010 +0200 raw sockets: get dst. ip from the ip header Get the destination ip from the packet header (when using IP_HDRINCL we don't set PKT_INFO so we don't have the destination information). --- raw_sock.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/raw_sock.c b/raw_sock.c index fb357c0..e8b90b1 100644 --- a/raw_sock.c +++ b/raw_sock.c @@ -284,9 +284,13 @@ int raw_udp4_recv(int rsock, char** buf, int len, union sockaddr_union* from, /* advance buf */ *buf=udp_payload; n=(int)(end-*buf); + /* fill ip from the packet (needed if no PKT_INFO is used) */ + dst_ip.af=AF_INET; + dst_ip.len=4; + dst_ip.u.addr32[0]=iph.daddr; /* fill dst_port */ dst_port=ntohs(udph.dest); - su_setport(to, dst_port); + ip_addr2su(to, &dst_ip, port); /* fill src_port */ src_port=ntohs(udph.source); su_setport(from, src_port);

13 years, 11 months

why git push fails

by Juha Heinanen

i tried to push a commit, but push failed like this: $ eg push jh(a)git.sip-router.org's password: Counting objects: 9, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (5/5), 1.19 KiB, done. Total 5 (delta 4), reused 0 (delta 0) error: hooks/update exited with error code 1 error: hook declined to update refs/heads/master To ssh://jh@git.sip-router.org/sip-router ! [remote rejected] master -> master (hook declined) error: failed to push some refs to 'ssh://jh@git.sip-router.org/sip-router' the error message does not say anything useful to normal user. -- juha

13 years, 11 months

git:master: modules/mediaproxy: ICE fixes

by Juha Heinanen

Module: sip-router Branch: master Commit: 976fb426bb577fab033e7846625fbfa2a8a38399 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=976fb42… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 9 12:27:42 2010 +0300 modules/mediaproxy: ICE fixes - ICE attributes may appear at the session level. - Insert our RTCP component if we found another component: some clients may not use a=rtcp line but then insert a RTCP candidate component. - Credits to Saul Ibarra Corretge. --- modules/mediaproxy/mediaproxy.c | 84 +++++++++++++++++++++++++++++++++++--- 1 files changed, 77 insertions(+), 7 deletions(-) diff --git a/modules/mediaproxy/mediaproxy.c b/modules/mediaproxy/mediaproxy.c index 732395d..67a0c72 100644 --- a/modules/mediaproxy/mediaproxy.c +++ b/modules/mediaproxy/mediaproxy.c @@ -134,6 +134,7 @@ typedef struct { str direction; Bool local_ip; // true if the IP is locally defined inside this media stream Bool has_ice; + Bool has_rtcp_ice; TransportType transport; char *start_line; char *next_line; @@ -914,21 +915,89 @@ get_rtcp_ip_attribute(str *block) } -// will return true if the stream in the given block -// has ice proposal/answer, false otherwise +// will return true if the given block has both +// a=ice-pwd and a=ice-ufrag attributes. static Bool -has_ice_proposal(str *block) +has_ice_attributes(str *block) { char *ptr; ptr = find_line_starting_with(block, "a=ice-pwd:", False); if (ptr) { ptr = find_line_starting_with(block, "a=ice-ufrag:", False); if (ptr) { - ptr = find_line_starting_with(block, "a=candidate:", False); - if (ptr) { + return True; + } + } + return False; +} + + +// will return true if the given SDP has both +// a=ice-pwd and a=ice-ufrag attributes at the +// session level. +static Bool +has_session_ice_attributes(str *sdp) +{ + str block; + char *ptr; + + // session level ICE attributes can be found from the beginning up to the first media block + ptr = find_line_starting_with(sdp, "m=", False); + if (ptr) { + block.s = sdp->s; + block.len = ptr - block.s; + } else { + block = *sdp; + } + + return has_ice_attributes(&block); +} + + +// will return true if the given block contains +// a a=candidate attribute. This should be called +// for a stream, as a=candidate attribute is not +// allowed at the session level +static Bool +has_ice_candidates(str *block) +{ + char *ptr; + ptr = find_line_starting_with(block, "a=candidate:", False); + if (ptr) { + return True; + } + return False; +} + + +// will return true if given block contains an ICE +// candidate with the given component ID +static Bool +has_ice_candidate_component(str *block, int id) +{ + char *ptr, *block_end; + int i, components, count; + str chunk, zone, tokens[2]; + + block_end = block->s + block->len; + components = count_lines_starting_with(block, "a=candidate:", False); + for (i=0, chunk=*block; i<components; i++) { + ptr = find_line_starting_with(&chunk, "a=candidate:", False); + if (!ptr) + break; + + zone.s = ptr + 12; + zone.len = findendline(zone.s, block_end - zone.s) - zone.s; + count = get_str_tokens(&zone, tokens, 2); + + if (count == 2) { + if (strtoint(&tokens[1]) == id) { return True; } } + + chunk.s = zone.s + zone.len; + chunk.len = block_end - chunk.s; } return False; } @@ -1242,7 +1311,8 @@ get_session_info(str *sdp, SessionInfo *session) session->streams[i].rtcp_ip = get_rtcp_ip_attribute(&block); session->streams[i].rtcp_port = get_rtcp_port_attribute(&block); session->streams[i].direction = get_direction_attribute(&block, &session->direction); - session->streams[i].has_ice = has_ice_proposal(&block); + session->streams[i].has_ice = ((has_ice_attributes(&block) || has_session_ice_attributes(sdp)) && has_ice_candidates(&block)); + session->streams[i].has_rtcp_ice = has_ice_candidate_component(&block, 2); session->streams[i].first_ice_candidate = find_line_starting_with(&block, "a=candidate:", False); } @@ -1748,7 +1818,7 @@ use_media_proxy(struct sip_msg *msg, char *dialog_id, ice_candidate_data *ice_da return -1; } - if (stream.rtcp_port.len>0 && !isnullport(stream.rtcp_port)) { + if (stream.has_rtcp_ice) { candidate.s = buf; candidate.len = sprintf(candidate.s, "a=candidate:R%x 2 UDP %u %.*s %i typ relay%.*s", hexip.s_addr,

13 years, 11 months

git:master: PKG Debian

by Jon Bonilla

Module: sip-router Branch: master Commit: 8888d2b7f3791f1022564972974440405b3f8ab5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8888d2b… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Mon Jun 7 23:38:59 2010 +0200 PKG Debian - Merge from kamailio_3.0 branch of debian packaging folders --- pkg/kamailio/debian-etch/changelog | 38 ++ pkg/kamailio/debian-etch/control | 118 ++---- pkg/kamailio/debian-etch/rules | 466 +++++++------------- pkg/kamailio/debian-lenny | 1 + pkg/kamailio/debian-lenny/changelog | 21 - pkg/kamailio/debian-lenny/rules | 413 ----------------- pkg/kamailio/debian-squeeze/changelog | 52 +++ .../{debian-lenny => debian-squeeze}/compat | 0 .../{debian-lenny => debian-squeeze}/control | 104 ++--- .../{debian-lenny => debian-squeeze}/copyright | 2 +- .../kamailio.README.Debian | 0 .../kamailio.default | 0 .../{debian-lenny => debian-squeeze}/kamailio.dirs | 0 .../kamailio.examples | 0 .../{debian-lenny => debian-squeeze}/kamailio.init | 0 .../kamailio.postinst | 0 pkg/kamailio/debian-squeeze/rules | 220 +++++++++ pkg/kamailio/debian/changelog | 24 + pkg/kamailio/debian/control | 21 +- pkg/kamailio/ubuntu-lucid | 1 + 20 files changed, 591 insertions(+), 890 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=888…

13 years, 11 months

git:kamailio_3.0: *PKG Debian

by Jon Bonilla

Module: sip-router Branch: kamailio_3.0 Commit: 3224810f6fc75b0f7a498e8bfe3947c0e05bc98f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3224810… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sun Jun 6 13:26:31 2010 +0200 *PKG Debian - Mantainer header changed to $me --- pkg/kamailio/debian-etch/control | 3 +-- pkg/kamailio/debian-squeeze/control | 3 +-- pkg/kamailio/debian/control | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kamailio/debian-etch/control b/pkg/kamailio/debian-etch/control index 1aa0516..f29ef2a 100644 --- a/pkg/kamailio/debian-etch/control +++ b/pkg/kamailio/debian-etch/control @@ -1,8 +1,7 @@ Source: kamailio Section: net Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers(a)lists.alioth.debian.org> -Uploaders: Kilian Krause <kilian(a)debian.org> +Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian-squeeze/control b/pkg/kamailio/debian-squeeze/control index edd9255..5178bec 100644 --- a/pkg/kamailio/debian-squeeze/control +++ b/pkg/kamailio/debian-squeeze/control @@ -1,8 +1,7 @@ Source: kamailio Section: net Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers(a)lists.alioth.debian.org> -Uploaders: Kilian Krause <kilian(a)debian.org> +Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libmemcache-dev, libreadline5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index 14f159c..d4f1d6c 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -1,8 +1,7 @@ Source: kamailio Section: net Priority: optional -Maintainer: Debian VoIP Team <pkg-voip-maintainers(a)lists.alioth.debian.org> -Uploaders: Kilian Krause <kilian(a)debian.org> +Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

13 years, 11 months

git:andrei/tcp_tls_changes: tls: ssl_flush() fix and re-worked error reporting

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: d9730932a53c14ef039eb00b63d48e002c2c570f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d973093… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 4 22:26:01 2010 +0200 tls: ssl_flush() fix and re-worked error reporting - ssl_flush() did not properly handle connection in non-established state - all ssl_errors are now treated inside tls_generic_send() and tls_read_f() - queue size accounting fix --- modules/tls/tls_ct_wrq.c | 64 +++++++++++----- modules/tls/tls_ct_wrq.h | 6 +- modules/tls/tls_server.c | 194 +++++++++++++++++++++++---------------------- modules/tls/tls_server.h | 2 + 4 files changed, 149 insertions(+), 117 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d97…

13 years, 11 months

git:andrei/tcp_tls_changes: tls: fix queue accounting

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: f509ccdc8c3212a7df9c4089c9dcde0d2c44eef5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f509ccd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 4 22:17:51 2010 +0200 tls: fix queue accounting On queue flush the size of the queue was substracted twice. --- modules/tls/sbufq.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/tls/sbufq.h b/modules/tls/sbufq.h index 6b59751..cd29ecb 100644 --- a/modules/tls/sbufq.h +++ b/modules/tls/sbufq.h @@ -262,11 +262,9 @@ inline static int sbufq_flush(struct sbuffer_queue* q, int* flags, shm_free(b); q->offset=0; q->queued-=block_size; - ret+=block_size; }else{ q->offset+=n; q->queued-=n; - ret+=n; break; } }else{

13 years, 11 months

git:andrei/tcp_tls_changes: tls: tls.list rpc: fix timeout & ip display

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/tcp_tls_changes Commit: 1ea3a8c7842ed59309b6d555492921eba7459d44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ea3a8c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Jun 4 22:20:16 2010 +0200 tls: tls.list rpc: fix timeout & ip display - fix ip address display - fix timeout computation --- modules/tls/tls_rpc.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/tls/tls_rpc.c b/modules/tls/tls_rpc.c index 650c972..0013142 100644 --- a/modules/tls/tls_rpc.c +++ b/modules/tls/tls_rpc.c @@ -116,15 +116,15 @@ static void tls_list(rpc_t* rpc, void* c) tls_d = con->extra_data; rpc->add(c, "{", &handle); /* tcp data */ - if (ip_addr2sbuf(&con->rcv.src_ip, src_ip, sizeof(src_ip)) == 0) { + if ((len = ip_addr2sbuf(&con->rcv.src_ip, src_ip, sizeof(src_ip))) + == 0) BUG("failed to convert source ip"); - src_ip[0]=0; - } - if (ip_addr2sbuf(&con->rcv.dst_ip, dst_ip, sizeof(dst_ip)) == 0) { + src_ip[len] = 0; + if ((len = ip_addr2sbuf(&con->rcv.dst_ip, dst_ip, sizeof(dst_ip))) + == 0) BUG("failed to convert destination ip"); - dst_ip[0]=0; - } - timeout = TICKS_TO_S(con->timeout - get_ticks()); + dst_ip[len] = 0; + timeout = TICKS_TO_S(con->timeout - get_ticks_raw()); rpc->struct_add(handle, "ddsdsd", "id", con->id, "timeout", timeout,

13 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2010