sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

by Henning Westerholt

Module: sip-router Branch: master Commit: 7af697744bd9922ec8e46e1c07e91f591bb60306 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7af6977… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Jul 28 00:22:09 2011 +0200 doxygen documentation fixes --- dprint.h | 4 +--- dst_blacklist.h | 13 +++++-------- mod_fix.c | 11 +++-------- modules/tls/tls_bio.c | 3 --- modules/tls/tls_bio.h | 5 ++--- modules_k/presence/subscribe.h | 3 --- modules_k/tmx/t_mi.h | 3 --- parser/parse_allow.c | 7 ++----- parser/parse_allow.h | 7 ++++--- parser/parse_param.c | 15 +++++---------- parser/parse_param.h | 7 ++----- rvalue.h | 4 ++-- 12 files changed, 26 insertions(+), 56 deletions(-) diff --git a/dprint.h b/dprint.h index 31ba4a2..a9fda8c 100644 --- a/dprint.h +++ b/dprint.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2001-2003 FhG Fokus * * This file is part of ser, a free SIP server. @@ -103,7 +101,7 @@ (log_level_info[(level) - (L_ALERT)].syslog_level) -/** @brief my_pid(), process_no are from pt.h but we cannot #include it here +/** @brief my_pid(), process_no are from pt.h but we cannot \#include it here because of circular dependencies */ extern int process_no; extern int my_pid(); diff --git a/dst_blacklist.h b/dst_blacklist.h index a648b5d..69d83b0 100644 --- a/dst_blacklist.h +++ b/dst_blacklist.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2006 iptelorg GmbH * * This file is part of ser, a free SIP server. @@ -94,7 +92,7 @@ void destroy_dst_blacklist(); /** force add to the blacklist. - * like @function dst_blacklist_add_to, but no ignore mask or + * like function dst_blacklist_add_to, but no ignore mask or * blacklist enabled checks are made. * @see dst_blacklist_add_to for the parameters and return value. */ @@ -102,7 +100,7 @@ int dst_blacklist_force_add_to(unsigned char err_flags, struct dest_info* si, struct sip_msg* msg, ticks_t timeout); /** force add to the blacklist, long version. - * like @function dst_blacklist_su_to, but no ignore mask or + * like function dst_blacklist_su_to, but no ignore mask or * blacklist enabled checks are made. * @see dst_blacklist_su_to for the parameters and return value. */ @@ -127,13 +125,12 @@ int dst_blacklist_force_su_to( unsigned char err_flags, /** checks if blacklist should be used, long version. - * @param err_flags - blacklist reason + * @param err_flags - blacklist reason * @param snd_flags - snd_flags pointer, can be 0. * @param proto - protocol, can be 0 (PROTO_NONE). - * @param si - sockaddr_union pointer, can be 0. + * @param su - sockaddr_union pointer, can be 0. * @return 1 if blacklist is enabled (core_cfg) and the event/error - * is not in the ignore list. - * 0 otherwise + * is not in the ignore list. 0 otherwise */ #define should_blacklist_su(err_flags, snd_flags, proto, su) \ (cfg_get(core, core_cfg, use_dst_blacklist) && \ diff --git a/mod_fix.c b/mod_fix.c index 8ea5211..df0ca54 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -15,10 +13,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/** - * @file mod_fix.c - * @brief kamailio compatible fixups - */ + /* * History: * -------- @@ -27,7 +22,7 @@ /*! * \file - * \brief SIP-router core :: + * \brief SIP-router core :: kamailio compatible fixups * \ingroup core * Module: \ref core */ @@ -67,7 +62,7 @@ int fixup_regexpNL_none(void** param, int param_no); /* textops */ * @param maxp - maximum parameter number * @param no1 - number of parameters of type1 * @param type1 - fix_param type for the 1st param - * @paran type2 - fix_param type for all the other params + * @param type2 - fix_param type for all the other params */ #define FIXUP_F2FP(suffix, minp, maxp, no1, type1, type2) \ int fixup_##suffix (void** param, int param_no) \ diff --git a/modules/tls/tls_bio.c b/modules/tls/tls_bio.c index 603caa8..f21a974 100644 --- a/modules/tls/tls_bio.c +++ b/modules/tls/tls_bio.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2010 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -20,7 +18,6 @@ * openssl BIOs for reading/writing via a fixed memory buffer. * @file * @ingroup tls - * @Module: @ref tls */ /* diff --git a/modules/tls/tls_bio.h b/modules/tls/tls_bio.h index 5336d6b..83128db 100644 --- a/modules/tls/tls_bio.h +++ b/modules/tls/tls_bio.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2010 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -15,11 +13,12 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + /** openssl BIOs for reading/writing via a fixed memory buffer. * @file modules/tls/tls_bio.h * @ingroup tls - * @Module: @ref tls */ + /* * History: * -------- diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index f6817cc..3e318a1 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * presence module - presence server implementation * * Copyright (C) 2006 Voice Sistem S.R.L. @@ -28,7 +26,6 @@ /*! \file * \brief Kamailio presence module :: SUBSCRIBE support - * \ref subscribe.c * \ingroup presence */ diff --git a/modules_k/tmx/t_mi.h b/modules_k/tmx/t_mi.h index 3b10d57..9b5cbc4 100644 --- a/modules_k/tmx/t_mi.h +++ b/modules_k/tmx/t_mi.h @@ -1,6 +1,4 @@ /* - * $Id: mi.h 4518 2008-07-28 15:39:28Z henningw $ - * * Header file for TM MI functions * * Copyright (C) 2006 Voice Sistem SRL @@ -31,7 +29,6 @@ * * \ingroup tm * - Module: \ref tm - * - \ref mi.c */ #ifndef _TM_MI_H_ diff --git a/parser/parse_allow.c b/parser/parse_allow.c index 6b60fea..da882f8 100644 --- a/parser/parse_allow.c +++ b/parser/parse_allow.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (c) 2004 Juha Heinanen * * This file is part of ser, a free SIP server. @@ -39,9 +37,8 @@ /*! \brief * This method is used to parse Allow header. * - * \params msg : sip msg - * \return 0 on success, - * -1 on failure. + * \param hf message header field + * \return 0 on success, -1 on failure. */ int parse_allow_header(struct hdr_field* _hf) { diff --git a/parser/parse_allow.h b/parser/parse_allow.h index 5d4dbce..5ce78aa 100644 --- a/parser/parse_allow.h +++ b/parser/parse_allow.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (c) 2004 Juha Heinanen * * This file is part of ser, a free SIP server. @@ -56,7 +54,10 @@ int parse_allow(struct sip_msg *msg); /*! \brief - * Parse Allow HF body + * This method is used to parse Allow header. + * + * \param hf message header field + * \return 0 on success, -1 on failure. */ int parse_allow_header(struct hdr_field* _h); diff --git a/parser/parse_param.c b/parser/parse_param.c index c68e237..6e8f653 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Generic Parameter Parser * * Copyright (C) 2001-2003 FhG Fokus @@ -503,14 +501,11 @@ error: /*! \brief * Parse parameters - * \param _s is string containing parameters, it will be updated to point behind the parameters - * \param _c is class of parameters - * \param _h is pointer to structure that will be filled with pointer to well known parameters - * \param the variable _p is pointing to - * linked list of parsed parameters will be stored - * - * The function returns 0 on success and negative number - * on an error + * \param _s is string containing parameters, it will be updated to point behind the parameters + * \param _c is class of parameters + * \param _h is pointer to structure that will be filled with pointer to well known parameters + * \param _p pointing to linked list where parsed parameters will be stored + * \return 0 on success and negative number on an error */ int parse_params(str* _s, pclass_t _c, param_hooks_t* _h, param_t** _p) { diff --git a/parser/parse_param.h b/parser/parse_param.h index 6850577..1b92de6 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Generic Parameter Parser * * Copyright (C) 2001-2003 FhG Fokus @@ -143,7 +141,7 @@ typedef union param_hooks { /*! \brief * Only parse one parameter - * @Return: + * @return: * t: out parameter * -1: on error * 0: success, but expect a next paramter @@ -157,8 +155,7 @@ inline int parse_param(str *_s, pclass_t _c, param_hooks_t *_h, param_t *t); * \param _s is string containing parameters * \param _c is class of parameters * \param _h is pointer to structure that will be filled with pointer to well known parameters - * linked list of parsed parameters will be stored in - * the variable _p is pointing to + * linked list of parsed parameters will be stored in the variable _p is pointing to * \return The function returns 0 on success and negative number * on an error */ diff --git a/rvalue.h b/rvalue.h index cc9085c..cedc752 100644 --- a/rvalue.h +++ b/rvalue.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -15,10 +13,12 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ + /** * @file * @brief rvalue expressions */ + /* * History: * --------

13 years, 4 months

[tracker] Task closed: force_send_socket not working in reply-route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#142 - force_send_socket not working in reply-route User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch applied to master and 3.1 branches, thanks. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=142 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 4 months

[tracker] User took ownership: force_send_socket not working in reply-route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#142 - force_send_socket not working in reply-route More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=142 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

13 years, 4 months

git:3.1: core: allow forcing send socket for replies

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 9dbf735878acc87bab1a0740476f1d106f89412f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9dbf735… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 27 19:34:35 2011 +0200 core: allow forcing send socket for replies - patch by Marcus Hunger, closes FS#142 (cherry picked from commit bf48d46366eb50ebcaf0972d2524b65d3accdffa) --- forward.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index 175f54b..aa71780 100644 --- a/forward.c +++ b/forward.c @@ -124,6 +124,8 @@ static int sock_inet = -1; static int sock_inet6 = -1; #endif /* USE_IPV6 */ +static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg); + struct socket_info* get_out_socket(union sockaddr_union* to, int proto) { int* temp_sock; @@ -829,6 +831,9 @@ int forward_reply(struct sip_msg* msg) } #endif + + apply_force_send_socket(&dst, msg); + if (msg_send(&dst, new_buf, new_len)<0) { STATS_RPL_FWD_DROP(); @@ -850,3 +855,10 @@ error: if (new_buf) pkg_free(new_buf); return -1; } + +static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg) +{ + if (msg->force_send_socket != 0) { + dst->send_sock = get_send_socket(msg, &dst->to, dst->proto); + } +}

13 years, 4 months

git:master: core: allow forcing send socket for replies

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: bf48d46366eb50ebcaf0972d2524b65d3accdffa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf48d46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 27 19:34:35 2011 +0200 core: allow forcing send socket for replies - patch by Marcus Hunger, closes FS#142 --- forward.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/forward.c b/forward.c index 3e4aecd..690ff47 100644 --- a/forward.c +++ b/forward.c @@ -124,6 +124,8 @@ static int sock_inet = -1; static int sock_inet6 = -1; #endif /* USE_IPV6 */ +static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg); + struct socket_info* get_out_socket(union sockaddr_union* to, int proto) { int* temp_sock; @@ -829,6 +831,9 @@ int forward_reply(struct sip_msg* msg) } #endif + + apply_force_send_socket(&dst, msg); + if (msg_send(&dst, new_buf, new_len)<0) { STATS_RPL_FWD_DROP(); @@ -850,3 +855,10 @@ error: if (new_buf) pkg_free(new_buf); return -1; } + +static void apply_force_send_socket(struct dest_info* dst, struct sip_msg* msg) +{ + if (msg->force_send_socket != 0) { + dst->send_sock = get_send_socket(msg, &dst->to, dst->proto); + } +}

13 years, 4 months

git:3.1: presence(k): removed mistakenly typed } before the previous commit

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 66b15ad5369a24ea6fce563215e6efe6f8ba35ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66b15ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 21 08:07:22 2011 +0200 presence(k): removed mistakenly typed } before the previous commit (cherry picked from commit 403ba772771545f4410ba4a5cf396125be353b12) --- modules_k/presence/presentity.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 50f7f30..9b9077c 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -365,7 +365,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, query_vals[n_query_cols].val.str_val.s = ""; query_vals[n_query_cols].val.str_val.len = 0; } - } n_query_cols++; query_cols[n_query_cols] = &str_body_col;

13 years, 4 months

git:3.1: presence(k): log message abour not supported event printed as warning

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 3b23a42d19b3f53e2670cf1407c0ec029a0c443a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b23a42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 21 00:08:42 2011 +0200 presence(k): log message abour not supported event printed as warning (cherry picked from commit 460fc8bf6ad5108ff3779c85ff150e4f5145b189) --- modules_k/presence/publish.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/presence/publish.c b/modules_k/presence/publish.c index 05e6b15..839ed01 100644 --- a/modules_k/presence/publish.c +++ b/modules_k/presence/publish.c @@ -512,10 +512,10 @@ int handle_publish(struct sip_msg* msg, char* sender_uri, char* str2) unsupported_event: - LM_ERR("Missing or unsupported event header field value\n"); + LM_WARN("Missing or unsupported event header field value\n"); if(msg->event && msg->event->body.s && msg->event->body.len>0) - LM_ERR("\tevent=[%.*s]\n", msg->event->body.len, msg->event->body.s); + LM_ERR(" event=[%.*s]\n", msg->event->body.len, msg->event->body.s); reply_code= BAD_EVENT_CODE; reply_str= pu_489_rpl;

13 years, 4 months

git:3.1: presence(k): insert empty string as sender in db if missing

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 97131c94922d48ed7aed632bb34293af034a5fee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97131c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jul 21 00:31:49 2011 +0200 presence(k): insert empty string as sender in db if missing - if sender_uri parameter is not given to handle_publish(), insert empty string for sender column in presentity table - the field is used for SLA/BLA - fixes constraint of non-null value in db table, reported by Roberto Fichera (cherry picked from commit b39747e213e350609761d14583db3e689ad6fefc) --- modules_k/presence/presentity.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 1dd9466..50f7f30 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -354,15 +354,19 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, (int)time(NULL); n_query_cols++; - if( presentity->sender) + query_cols[n_query_cols] = &str_sender_col; + query_vals[n_query_cols].type = DB1_STR; + query_vals[n_query_cols].nul = 0; + if(presentity->sender) { - query_cols[n_query_cols] = &str_sender_col; - query_vals[n_query_cols].type = DB1_STR; - query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.str_val.s = presentity->sender->s; query_vals[n_query_cols].val.str_val.len = presentity->sender->len; - n_query_cols++; + } else { + query_vals[n_query_cols].val.str_val.s = ""; + query_vals[n_query_cols].val.str_val.len = 0; + } } + n_query_cols++; query_cols[n_query_cols] = &str_body_col; query_vals[n_query_cols].type = DB1_BLOB;

13 years, 4 months

git:3.1: srdb1: added definition of pipelimit module db table

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 55e4811d4d0620d1dcbb94b1462f443195564594 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=55e4811… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jul 20 23:35:01 2011 +0200 srdb1: added definition of pipelimit module db table (cherry picked from commit e8a949e3032b9cadf40ce2be0027c780b29637a7) --- lib/srdb1/schema/kamailio-pipelimit.xml | 12 ++++++ lib/srdb1/schema/pipelimit.xml | 61 +++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-pipelimit.xml b/lib/srdb1/schema/kamailio-pipelimit.xml new file mode 100644 index 0000000..5fd7d2d --- /dev/null +++ b/lib/srdb1/schema/kamailio-pipelimit.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>Pipelimit</name> + <xi:include href="pipelimit.xml"/> +</database> diff --git a/lib/srdb1/schema/pipelimit.xml b/lib/srdb1/schema/pipelimit.xml new file mode 100644 index 0000000..5ae2bb6 --- /dev/null +++ b/lib/srdb1/schema/pipelimit.xml @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="pl_pipes" xmlns:db="http://docbook.org/ns/docbook"> + <name>pl_pipes</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para> This table us used by the pipelimit module to keep the definition of pipes. + More information about the pipelimit module can be found at: &KAMAILIO_MOD_DOC;pipelimit.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>unique ID</description> + </column> + + <column> + <name>pipeid</name> + <type>string</type> + <size>64</size> + <default/> + <description>Unique ID for pipe</description> + </column> + + <column> + <name>algorithm</name> + <type>string</type> + <size>32</size> + <default/> + <description>Algorithm to be used for pipe limits. See the readme of the + module for description of available options: NOP, RED, TAILDROP, FEEDBACK, NETWORK + </description> + </column> + + <column> + <name>plimit</name> + <type>int</type> + <default>0</default> + <description>Pipe limit (hits per second)</description> + </column> + + <index> + <name>account_idx</name> + <colref linkend="username"/> + <colref linkend="domain"/> + </index> + +</table>

13 years, 4 months

git:3.1: core: new function to get IP address from su structure

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 189644b5100b8a7285688c87d2081bb3c8937500 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=189644b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 18 22:34:47 2011 +0200 core: new function to get IP address from su structure - suip2a(...) returns zero-terminated string representation of IPv4/IPv6 address (cherry picked from commit fabaa667795e5162fe17afd3e4a073bc99057144) --- ip_addr.h | 30 +++++++++++++++++++++++++++++- 1 files changed, 29 insertions(+), 1 deletions(-) diff --git a/ip_addr.h b/ip_addr.h index 2f04693..d9cbf02 100644 --- a/ip_addr.h +++ b/ip_addr.h @@ -722,7 +722,7 @@ static inline char* su2a(union sockaddr_union* su, int su_len) { static char buf[SU2A_MAX_STR_SIZE]; int offs; - + #ifdef USE_IPV6 if (unlikely(su->s.sa_family==AF_INET6)){ if (unlikely(su_len<sizeof(su->sin6))) @@ -744,6 +744,34 @@ static inline char* su2a(union sockaddr_union* su, int su_len) return buf; } +#define SUIP2A_MAX_STR_SIZE (IP6_MAX_STR_SIZE + 2 /* [] */ + 1 /* \0 */) +/* returns an asciiz string containing the ip + * (<ipv4_addr> or [<ipv6_addr>]) + */ +static inline char* suip2a(union sockaddr_union* su, int su_len) +{ + static char buf[SUIP2A_MAX_STR_SIZE]; + int offs; + +#ifdef USE_IPV6 + if (unlikely(su->s.sa_family==AF_INET6)){ + if (unlikely(su_len<sizeof(su->sin6))) + return "<addr. error>"; + buf[0]='['; + offs=1+ip6tosbuf((unsigned char*)su->sin6.sin6_addr.s6_addr, &buf[1], + sizeof(buf)-4); + buf[offs]=']'; + offs++; + }else +#endif /* USE_IPV6*/ + if (unlikely(su_len<sizeof(su->sin))) + return "<addr. error>"; + else + offs=ip4tosbuf((unsigned char*)&su->sin.sin_addr, buf, sizeof(buf)-2); + buf[offs]=0; + return buf; +} + /* converts an ip_addr structure to a hostent, returns pointer to internal

13 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011