sr-dev July 2013

sr-dev@lists.kamailio.org

21 participants
247 discussions

git:richard.good/diameter_rx_media: modules/ims_qos: uppdate to work with TM API
by Richard Good 16 Jul '13

16 Jul '13

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 295f5bd8e0d6f810bbc1bc6736ad1c27576a2408 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=295f5bd… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jul 16 16:06:53 2013 +0200 modules/ims_qos: uppdate to work with TM API -Update to work with merged TM suspend reply functionality --- modules/ims_qos/mod.c | 4 ++-- modules/ims_qos/rx_aar.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 16d31e5..16d522e 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -576,7 +576,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* str1, char* bar) { } LM_DBG("Suspending SIP TM transaction\n"); - if (tmb.t_suspend_reply(msg, &saved_t_data->tindex, &saved_t_data->tlabel) < 0) { + if (tmb.t_suspend(msg, &saved_t_data->tindex, &saved_t_data->tlabel) < 0) { LM_ERR("failed to suspend the TM processing\n"); free_saved_transaction_global_data(saved_t_data); return CSCF_RETURN_ERROR; @@ -587,7 +587,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* str1, char* bar) { if (!ret) { LM_ERR("Failed to send AAR\n"); - tmb.t_cancel_suspend_reply(saved_t_data->tindex, saved_t_data->tlabel); + tmb.t_cancel_suspend(saved_t_data->tindex, saved_t_data->tlabel); goto error; diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index bca0a2d..b5e7293 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -165,7 +165,7 @@ done: if (aaa) cdpb.AAAFreeMessage(&aaa); - tmb.t_continue_reply(data->tindex, data->tlabel, data->act); + tmb.t_continue(data->tindex, data->tlabel, data->act); free_saved_transaction_global_data(data); }

1 0

git:tmp/tm_async_reply_support: modules/tm/doc: Updated documentation for TM with merged methods
by Richard Good 16 Jul '13

16 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 8885e218ef4c187b22183bf67adfb7c60407c478 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8885e21… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jul 16 16:05:32 2013 +0200 modules/tm/doc: Updated documentation for TM with merged methods --- modules/tm/doc/api.xml | 124 +----------------------------------------------- 1 files changed, 1 insertions(+), 123 deletions(-) diff --git a/modules/tm/doc/api.xml b/modules/tm/doc/api.xml index 7aeea5d..0a3c751 100644 --- a/modules/tm/doc/api.xml +++ b/modules/tm/doc/api.xml @@ -157,7 +157,7 @@ end of body This function together with t_continue() can be used to implement asynchronous actions: t_suspend() saves the transaction, returns its identifiers, and t_continue() continues the - SIP request processing. (The request processing does not continue + SIP request/response processing. (The request/response processing does not continue from the same point in the script, a separate route block defined by the parameter of t_continue() is executed instead. The reply lock is held during the route block execution.) @@ -262,127 +262,5 @@ end of body </itemizedlist> <para>Return value: 0 - success, <0 - error.</para> </section> - - <section id="t_suspend_reply"> - <title> - <function>int t_suspend_reply(struct sip_msg *msg, - unsigned int *hash_index, unsigned int *label)</function> - </title> - <para> - For programmatic use only. - This function is the equivalent of t_continue, but used to - suspend on SIP responses. - This function together with t_continue_reply() can be used to - implement asynchronous actions on responses: t_suspend() saves - the transaction, returns its identifiers, and t_continue() continues the - SIP response processing. (The response processing does not continue - from the same point in the script, a separate route block defined - by the parameter of t_continue_reply() is executed instead. The reply lock - is held during the route block execution.) - FR timer is ticking while the transaction is suspended, and the - transaction's failure route is executed if t_continue() is not - called in time. - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>msg</emphasis> - SIP message pointer. - </para> - </listitem> - <listitem> - <para><emphasis>hash_index</emphasis> - transaction identifier. - </para> - </listitem> - <listitem> - <para><emphasis>label</emphasis> - transaction identifier. - </para> - </listitem> - </itemizedlist> - <para>Return value: 0 - success, <0 - error.</para> - <para> - Usage: Allocate a memory block for storing the transaction identifiers - (hash_index and label), and for storing also any variable related to - the async query. Before calling t_suspend(), register for the following - callbacks, and pass the pointer to the allocated shared memory as - a parameter: TMCB_ON_FAILURE, TMCB_DESTROY, and TMCB_E2ECANCEL_IN - (in case of INVITE transaction). The async operation can be - cancelled, if it is still pending, when TMCB_ON_FAILURE or - TMCB_E2ECANCEL_IN is called. TMCB_DESTROY is suitable to free - the shared memory allocated for the async and SIP transaction identifiers. - Once the async query result is available call t_continue(), see below. - The SIP transaction must exist before calling t_suspend(), and the module - function calling t_suspend() should return 0 to make sure that the script - processing does not continue. - </para> - </section> - - <section id="t_continue_reply"> - <title> - <function>int t_continue_reply(unsigned int hash_index, unsigned int label, - struct action *route, int branch)</function> - </title> - <para> - For programmatic use only. - This function is the equivalent of t_continue but used to - suspend on SIP responses. - This function is the pair of t_suspend_reply(), and is supposed - to be called when the asynchronous query result is available. - The function executes a route block with the saved SIP message. - The calling application passes in the branch of the suspended - reply when wanting to continue. - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>hash_index</emphasis> - transaction identifier. - </para> - </listitem> - <listitem> - <para><emphasis>label</emphasis> - transaction identifier. - </para> - </listitem> - <listitem> - <para><emphasis>route</emphasis> - route block to execute. - </para> - </listitem> - <listitem> - <para><emphasis>branch</emphasis> - reply branch to resume. - </para> - </listitem> - </itemizedlist> - <para>Return value: 0 - success, <0 - error.</para> - </section> - - <section id="t_cancel_suspend_reply"> - <title> - <function>int t_cancel_suspend_reply(unsigned int hash_index, unsigned int label, branch)</function> - </title> - <para> - For programmatic use only. - This function is the equivalent of t_cancel_suspend but for SIP - responses. - This function is for revoking t_suspend_reply() from the - same process as it was executed before. t_cancel_suspend_reply() can be - used when something fails after t_suspend_reply() has already been executed - and it turns out that the transcation should not have been - suspended. The function cancels the FR timer of the transacation. - </para> - <para>Meaning of the parameters is as follows:</para> - <itemizedlist> - <listitem> - <para><emphasis>hash_index</emphasis> - transaction identifier. - </para> - </listitem> - <listitem> - <para><emphasis>label</emphasis> - transaction identifier. - </para> - </listitem> - <listitem> - <para><emphasis>branch</emphasis> - reply branch that was suspended. - </para> - </listitem> - </itemizedlist> - <para>Return value: 0 - success, <0 - error.</para> - </section> </section> </section>

1 0

git:tmp/tm_async_reply_support: Merge branch 'master' into tmp/ tm_async_reply_support
by Richard Good 16 Jul '13

16 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 68183c5a0504f0f16446337ac2555603709a0f3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68183c5… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jul 16 16:06:21 2013 +0200 Merge branch 'master' into tmp/tm_async_reply_support ---

1 0

git:tmp/tm_async_reply_support: modules/tm: merge t_suspend_reply and t_continue_reply with t_suspend and t_continue
by Richard Good 16 Jul '13

16 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 647257c802c4f9ff66a50aa2549263d2f48e3eaa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=647257c… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Tue Jul 16 16:03:14 2013 +0200 modules/tm: merge t_suspend_reply and t_continue_reply with t_suspend and t_continue - Merged reply specific methods into general continue and reply methods - For simplicity and readability --- modules/tm/t_suspend.c | 681 ++++++++++++++++++++--------------------------- modules/tm/t_suspend.h | 15 - modules/tm/tm_load.c | 3 - modules/tm/tm_load.h | 3 - 4 files changed, 290 insertions(+), 412 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=647…

1 0

git:master: ipops: reset address types for new dns queries
by Daniel-Constantin Mierla 15 Jul '13

15 Jul '13

Module: sip-router Branch: master Commit: 257225e6918c1387049b74663225ee9b3b722ddf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=257225e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 15 23:38:25 2013 +0200 ipops: reset address types for new dns queries --- modules/ipops/ipops_pv.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/ipops/ipops_pv.c b/modules/ipops/ipops_pv.c index e1b38e5..08be1fe 100644 --- a/modules/ipops/ipops_pv.c +++ b/modules/ipops/ipops_pv.c @@ -375,6 +375,8 @@ int dns_update_pv(str *hostname, str *name) /* reset the counter */ dr->count = 0; + dr->ipv4 = 0; + dr->ipv6 = 0; strncpy(dr->hostname, hostname->s, hostname->len); dr->hostname[hostname->len] = '\0';

1 0

git:master: ipops: documented dns_query()
by Daniel-Constantin Mierla 15 Jul '13

15 Jul '13

Module: sip-router Branch: master Commit: b4c3b811d33846dd0900922bbe5a3d9472839663 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4c3b81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 15 23:45:33 2013 +0200 ipops: documented dns_query() --- modules/ipops/README | 36 +++++++++++++++++++- modules/ipops/doc/ipops_admin.xml | 66 +++++++++++++++++++++++++++++++++--- 2 files changed, 94 insertions(+), 8 deletions(-) diff --git a/modules/ipops/README b/modules/ipops/README index cd6118e..982db00 100644 --- a/modules/ipops/README +++ b/modules/ipops/README @@ -38,6 +38,7 @@ I 4.10. is_in_subnet (ip, subnet) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) + 4.13. dns_query(hostname, pvid) List of Examples @@ -53,6 +54,7 @@ I 1.10. is_in_subnet usage 1.11. dns_sys_match_ip usage 1.12. dns_int_match_ip usage + 1.13. dns_query usage Chapter 1. Admin Guide @@ -79,6 +81,7 @@ Chapter 1. Admin Guide 4.10. is_in_subnet (ip, subnet) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) + 4.13. dns_query(hostname, pvid) 1. Overview @@ -132,6 +135,7 @@ Chapter 1. Admin Guide 4.10. is_in_subnet (ip, subnet) 4.11. dns_sys_match_ip(hostname, ipaddr) 4.12. dns_int_match_ip(hostname, ipaddr) + 4.13. dns_query(hostname, pvid) 4.1. is_ip (ip) @@ -348,9 +352,9 @@ if (is_in_subnet("10.0.123.123", "10.0.123.1/24")) { providing load balancing through DNS). Parameters: - * ipaddr - string or pseudo-variable containing the ip address. * hostname - string or pseudo-variable containing the hostname. The resulting IP addresses from DNS query are compared with ipaddr. + * ipaddr - string or pseudo-variable containing the ip address. This function can be used from ANY_ROUTE. @@ -372,9 +376,9 @@ if (!dns_sys_match_ip("myhost.com", "1.2.3.4")) { in different address famililies (IPv4/6). Parameters: - * ipaddr - string or pseudo-variable containing the ip address. * hostname - string or pseudo-variable containing the hostname. The resulting IP addresses from DNS query are compared with ipaddr. + * ipaddr - string or pseudo-variable containing the ip address. This function can be used from ANY_ROUTE. @@ -384,3 +388,31 @@ if (!dns_int_match_ip("myhost.com", "1.2.3.4")) { xdbg("ip address not associated with hostname\n"); } ... + +4.13. dns_query(hostname, pvid) + + Store the IP addresses and their type that correspond to hostname in a + config variable $dns(pvid=>key). + + Parameters: + * hostname - string or pseudo-variable containing the hostname. The + resulting IP addresses from DNS query are compared with ipaddr. + * pvid - container id for script variable. + + This function can be used from ANY_ROUTE. + + Example 1.13. dns_query usage +... +if(dns_query("test.com", "xyz")) +{ + xlog(" number of addresses: $dns(xyz=>count)\n"); + xlog(" ipv4 address found: $dns(xyz=>ipv4)\n"); + xlog(" ipv6 address found: $dns(xyz=>ipv6)\n"); + $var(i) = 0; + while($var(i)<$dns(xyz=>count)) { + xlog(" #[$var(i)] type ($dns(xyz=>type[$var(i)]))" + " addr [$dns(xyz=>addr[$var(i)])]\n"); + $var(i) = $var(i) + 1; + } +} +... diff --git a/modules/ipops/doc/ipops_admin.xml b/modules/ipops/doc/ipops_admin.xml index 9f3528d..bbf68cf 100644 --- a/modules/ipops/doc/ipops_admin.xml +++ b/modules/ipops/doc/ipops_admin.xml @@ -547,13 +547,13 @@ if (is_in_subnet("10.0.123.123", "10.0.123.1/24")) { <itemizedlist> <listitem> <para> - <emphasis>ipaddr</emphasis> - string or pseudo-variable containing the ip address. + <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. + The resulting IP addresses from DNS query are compared with ipaddr. </para> </listitem> <listitem> <para> - <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. - The resulting IP addresses from DNS query are compared with ipaddr. + <emphasis>ipaddr</emphasis> - string or pseudo-variable containing the ip address. </para> </listitem> </itemizedlist> @@ -596,13 +596,13 @@ if (!dns_sys_match_ip("myhost.com", "1.2.3.4")) { <itemizedlist> <listitem> <para> - <emphasis>ipaddr</emphasis> - string or pseudo-variable containing the ip address. + <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. + The resulting IP addresses from DNS query are compared with ipaddr. </para> </listitem> <listitem> <para> - <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. - The resulting IP addresses from DNS query are compared with ipaddr. + <emphasis>ipaddr</emphasis> - string or pseudo-variable containing the ip address. </para> </listitem> </itemizedlist> @@ -626,6 +626,60 @@ if (!dns_int_match_ip("myhost.com", "1.2.3.4")) { </section> + <section id="ipops.f.dns_query"> + <title> + <function moreinfo="none">dns_query(hostname, pvid)</function> + </title> + + <para> + Store the IP addresses and their type that correspond to hostname + in a config variable $dns(pvid=>key). + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. + The resulting IP addresses from DNS query are compared with ipaddr. + </para> + </listitem> + <listitem> + <para> + <emphasis>pvid</emphasis> - container id for script variable. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>dns_query</function> usage + </title> + <programlisting format="linespecific"> +... +if(dns_query("test.com", "xyz")) +{ + xlog(" number of addresses: $dns(xyz=>count)\n"); + xlog(" ipv4 address found: $dns(xyz=>ipv4)\n"); + xlog(" ipv6 address found: $dns(xyz=>ipv6)\n"); + $var(i) = 0; + while($var(i)<$dns(xyz=>count)) { + xlog(" #[$var(i)] type ($dns(xyz=>type[$var(i)]))" + " addr [$dns(xyz=>addr[$var(i)])]\n"); + $var(i) = $var(i) + 1; + } +} +... + </programlisting> + </example> + + </section> + </section> </chapter>

1 0

git:master: ipops: new function dns_query(hostname, pvid)
by Daniel-Constantin Mierla 15 Jul '13

15 Jul '13

Module: sip-router Branch: master Commit: 20f3846d6d39e8fd599464d1e5ce48bfec326586 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=20f3846… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 15 23:32:33 2013 +0200 ipops: new function dns_query(hostname, pvid) - store the result of dns query in a variable $dns(pvid=>key) - dns query is using getaddrinfo() - $dns(pvid=>key) - new pv allowing to navigate through the result of a dns query - key can be: - count - number of addresses - ipv4 - set to 1 if at least one ipv4 address (otherwise 0) - ipv6 - set to 1 if at least one ipv6 address (otherwise 0) - addr[index] - the address as string from position index in the list (0 based indexing) - type[index] - the type of address from position index in the list (0 based indexing), the value is 4 for ipv4 and 6 for ipv6 - example: if(dns_query("test.com", "xyz")) { xlog("===== number of addresses: $dns(xyz=>count)\n"); xlog("===== ipv4 address found: $dns(xyz=>ipv4)\n"); xlog("===== ipv6 address found: $dns(xyz=>ipv6)\n"); $var(i) = 0; while($var(i)<$dns(xyz=>count)) { xlog("===== #[$var(i)] type ($dns(xyz=>addr[$var(i)])) addr [$dns(xyz=>addr[$var(i)])]\n"); $var(i) = $var(i) + 1; } } --- modules/ipops/ipops_mod.c | 42 +++++- modules/ipops/ipops_pv.c | 428 +++++++++++++++++++++++++++++++++++++++++++++ modules/ipops/ipops_pv.h | 39 ++++ 3 files changed, 508 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=20f…

1 0

entity value with uri schema
by Daniel-Constantin Mierla 15 Jul '13

15 Jul '13

Hi Klaus, there is a patch on tracker to presence_dialoginfo for adding schema ( sip: ) to entity values in generated notify requests, see: - http://sip-router.org/tracker/index.php?do=details&task_id=324 Apparently it is correct, based on examples from RFC, but as you developed and tested, maybe you remember that was a different reason not to do so. The question is whether to make this a configuration option or just add schema always. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

2 3

git:tmp/tm_async_reply_support: modules/tm: fix bad comment.
by Jason Penton 15 Jul '13

15 Jul '13

Module: sip-router Branch: tmp/tm_async_reply_support Commit: f126ab332bc21048ec1b768353d62304c7b524e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f126ab3… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Mon Jul 15 16:33:41 2013 +0200 modules/tm: fix bad comment. --- modules/tm/t_reply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8542340..3335629 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -886,7 +886,7 @@ void faked_env_async( struct cell *t, struct sip_msg *msg) { bind_address=t->uac[0].request.dst.send_sock; } else { /* on async restore - we don't need to do anything because we never really had - an environment to restore prior to the suspend anyway ;) */ + an environment to restore prior to calling continue anyway ;) */ LM_DBG("nothing to restore for async...\n"); } }

1 0

git:master: ipops: new cfg function dns_nc_match_ip(hostname, ipaddr)
by Daniel-Constantin Mierla 15 Jul '13

15 Jul '13

Module: sip-router Branch: master Commit: ccebf9e536d7d5ea8fc824ea089d501e888b37c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ccebf9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jul 12 13:31:12 2013 +0200 ipops: new cfg function dns_nc_match_ip(hostname, ipaddr) - do dns query for the hostname and compare the result to see if is a match with ipaddr --- modules/ipops/README | 24 ++++++++++ modules/ipops/doc/ipops_admin.xml | 45 ++++++++++++++++++++ modules/ipops/ipops_mod.c | 84 +++++++++++++++++++++++++++++++++++++ 3 files changed, 153 insertions(+), 0 deletions(-) diff --git a/modules/ipops/README b/modules/ipops/README index bd79553..901535a 100644 --- a/modules/ipops/README +++ b/modules/ipops/README @@ -36,6 +36,7 @@ I 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) 4.10. is_in_subnet (ip, subnet) + 4.11. dns_nc_match_ip(hostname, ipaddr) List of Examples @@ -49,6 +50,7 @@ I 1.8. compare_pure_ips usage 1.9. is_ip_rfc1918 usage 1.10. is_in_subnet usage + 1.11. dns_nc_match_ip usage Chapter 1. Admin Guide @@ -73,6 +75,7 @@ Chapter 1. Admin Guide 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) 4.10. is_in_subnet (ip, subnet) + 4.11. dns_nc_match_ip(hostname, ipaddr) 1. Overview @@ -124,6 +127,7 @@ Chapter 1. Admin Guide 4.8. compare_pure_ips (ip1, ip2) 4.9. is_ip_rfc1918 (ip) 4.10. is_in_subnet (ip, subnet) + 4.11. dns_nc_match_ip(hostname, ipaddr) 4.1. is_ip (ip) @@ -329,3 +333,23 @@ if (is_in_subnet("10.0.123.123", "10.0.123.1/24")) { xlog("L_INFO", "it's in the subnet\n"); } ... + +4.11. dns_nc_match_ip(hostname, ipaddr) + + Returns TRUE if ipaddr is associated by DNS to hostname. FALSE + otherwise. It does not use the internal DNS cache, but directly + getaddrinfo(...). + + Parameters: + * ipaddr - string or pseudo-variable containing the ip address. + * hostname - string or pseudo-variable containing the hostname. The + resulting IP addresses from DNS query are compared with ipaddress. + + This function can be used from ANY_ROUTE. + + Example 1.11. dns_nc_match_ip usage +... +if (!dns_nc_match_ip("myhost.com", "1.2.3.4")) { + xdbg("ip address not associated with hostname\n"); +} +... diff --git a/modules/ipops/doc/ipops_admin.xml b/modules/ipops/doc/ipops_admin.xml index c7ce810..afb03d8 100644 --- a/modules/ipops/doc/ipops_admin.xml +++ b/modules/ipops/doc/ipops_admin.xml @@ -529,6 +529,51 @@ if (is_in_subnet("10.0.123.123", "10.0.123.1/24")) { </section> + <section id="ipops.f.dns_nc_match_ip"> + <title> + <function moreinfo="none">dns_nc_match_ip(hostname, ipaddr)</function> + </title> + + <para> + Returns TRUE if ipaddr is associated by DNS to hostname. FALSE otherwise. It + does not use the internal DNS cache, but directly getaddrinfo(...). + </para> + + <para>Parameters:</para> + + <itemizedlist> + <listitem> + <para> + <emphasis>ipaddr</emphasis> - string or pseudo-variable containing the ip address. + </para> + </listitem> + <listitem> + <para> + <emphasis>hostname</emphasis> - string or pseudo-variable containing the hostname. + The resulting IP addresses from DNS query are compared with ipaddress. + </para> + </listitem> + </itemizedlist> + + <para> + This function can be used from ANY_ROUTE. + </para> + + <example> + <title> + <function>dns_nc_match_ip</function> usage + </title> + <programlisting format="linespecific"> +... +if (!dns_nc_match_ip("myhost.com", "1.2.3.4")) { + xdbg("ip address not associated with hostname\n"); +} +... + </programlisting> + </example> + + </section> + </section> </chapter> diff --git a/modules/ipops/ipops_mod.c b/modules/ipops/ipops_mod.c index 164177b..d21546c 100644 --- a/modules/ipops/ipops_mod.c +++ b/modules/ipops/ipops_mod.c @@ -40,12 +40,16 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <netdb.h> #include <arpa/inet.h> #include "../../sr_module.h" #include "../../dprint.h" #include "../../str.h" #include "../../mod_fix.h" #include "../../pvar.h" +#include "../../resolve.h" #include "api.h" #include "ip_parser.h" #include "rfc1918_parser.h" @@ -83,6 +87,7 @@ static int w_compare_ips(struct sip_msg*, char*, char*); static int w_compare_pure_ips(struct sip_msg*, char*, char*); static int w_is_ip_rfc1918(struct sip_msg*, char*); static int w_ip_is_in_subnet(struct sip_msg*, char*, char*); +static int w_dns_nc_match_ip(sip_msg_t*, char*, char*); /* @@ -110,6 +115,8 @@ static cmd_export_t cmds[] = REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, { "is_in_subnet", (cmd_function)w_ip_is_in_subnet, 2, fixup_spve_spve, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE }, + { "dns_nc_match_ip", (cmd_function)w_dns_nc_match_ip, 2, fixup_spve_spve, 0, + ANY_ROUTE }, { "bind_ipops", (cmd_function)bind_ipops, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -596,3 +603,80 @@ static int w_is_ip_rfc1918(struct sip_msg* _msg, char* _s) else return -1; } + +static inline ip_addr_t *strtoipX(str *ips) +{ + /* try to figure out INET class */ + if(ips->s[0] == '[' || memchr(ips->s, ':', ips->len)!=NULL) + { + /* IPv6 */ + return str2ip6(ips); + } else { + /* IPv4 */ + return str2ip(ips); + } +} + +static int w_dns_nc_match_ip(sip_msg_t *msg, char *hnp, char *ipp) +{ + struct addrinfo hints, *res, *p; + int status; + ip_addr_t *ipa; + void *addr; + str hns; + str ips; + struct sockaddr_in *ipv4; + struct sockaddr_in6 *ipv6; + + if (fixup_get_svalue(msg, (gparam_p)hnp, &hns)) + { + LM_ERR("cannot evaluate hostname parameter\n"); + return -2; + } + + if (fixup_get_svalue(msg, (gparam_p)ipp, &ips)) + { + LM_ERR("cannot evaluate ip address parameter\n"); + return -2; + } + + ipa = strtoipX(&ips); + if(ipa==NULL) + { + LM_ERR("invalid ip address: %.*s\n", ips.len, ips.s); + return -3; + } + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = AF_UNSPEC; /* allow any of AF_INET or AF_INET6 */ + + if ((status = getaddrinfo(hns.s, NULL, &hints, &res)) != 0) + { + LM_ERR("getaddrinfo: %s\n", gai_strerror(status)); + return -2; + } + + for(p = res;p != NULL; p = p->ai_next) + { + if(p->ai_family==ipa->af) + { + if (p->ai_family==AF_INET) + { + ipv4 = (struct sockaddr_in *)p->ai_addr; + addr = &(ipv4->sin_addr); + } else { + ipv6 = (struct sockaddr_in6 *)p->ai_addr; + addr = &(ipv6->sin6_addr); + } + if(memcmp(ipa->u.addr, addr, ipa->len)==0) + { + /* matched IP */ + freeaddrinfo(res); + return 1; + } + } + } + freeaddrinfo(res); + + return -1; +}

2 2

← Newer
1
...
8
9
10
11
12
13
14
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2013