December 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r6494 - freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 12:06:01 2007 New Revision: 6494 Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Log: fix off-by-5 error Modified: freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c ============================================================================== --- freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c (original) +++ freeswitch/trunk/libs/xmlrpc-c/lib/abyss/src/server.c Tue Dec 4 12:06:01 2007 @@ -1063,7 +1063,7 @@ DateToLogString(&s->date,z+n); - sprintf(z+n+26,"] \"%s\" %d %d",s->requestline,s->status,s->conn->outbytes); + sprintf(z+n+20,"] \"%s\" %d %d",s->requestline,s->status,s->conn->outbytes); LogWrite(s->server,z); return TRUE;

1 0

[commit] r6493 - freeswitch/trunk/src
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: mikej Date: Tue Dec 4 11:52:24 2007 New Revision: 6493 Modified: freeswitch/trunk/src/switch_utils.c Log: signedness error Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Dec 4 11:52:24 2007 @@ -58,7 +58,7 @@ SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len) { char *p, *q; - int x = 0; + switch_size_t x = 0; assert(s); q = buf;

1 0

[commit] r6492 - freeswitch/trunk/scripts
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 11:30:05 2007 New Revision: 6492 Modified: freeswitch/trunk/scripts/api.js Log: update Modified: freeswitch/trunk/scripts/api.js ============================================================================== --- freeswitch/trunk/scripts/api.js (original) +++ freeswitch/trunk/scripts/api.js Tue Dec 4 11:30:05 2007 @@ -46,6 +46,7 @@ exit(); } +request.write("Content-Type: text/html\n\n"); request.write("<title>FreeSWITCH Command Portal</title>"); request.write("<h2>FreeSWITCH Command Portal</h2>"); request.write("<form method=post><input name=command size=40> ");

1 0

[commit] r6491 - in freeswitch/trunk/src: . include mod/applications/mod_commands mod/xml_int/mod_xml_rpc
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 11:22:02 2007 New Revision: 6491 Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c freeswitch/trunk/src/switch_utils.c Log: adress MODAPP-55 Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue Dec 4 11:22:02 2007 @@ -57,6 +57,7 @@ SWITCH_DECLARE(switch_status_t) switch_b64_encode(unsigned char *in, switch_size_t ilen, unsigned char *out, switch_size_t olen); SWITCH_DECLARE(switch_status_t) switch_b64_decode(char *in, char *out, switch_size_t olen); +SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len); static inline switch_bool_t switch_is_digit_string(const char *s) { Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Dec 4 11:22:02 2007 @@ -1545,9 +1545,13 @@ for (x = 0; x < argc; x++) { char *val = switch_str_nil(argv[x]); + if (holder->http) { + char aval[512]; + + switch_amp_encode(argv[x], aval, sizeof(aval)); holder->stream->write_function(holder->stream, "<td>"); - holder->stream->write_function(holder->stream, "%s%s", val, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); + holder->stream->write_function(holder->stream, "%s%s", aval, x == (argc - 1) ? "</td></tr>\n" : "</td><td>"); } else { holder->stream->write_function(holder->stream, "%s%s", val, x == (argc - 1) ? "\n" : holder->delim); } @@ -1582,7 +1586,7 @@ } } - if (!as && stream->event) { + if (stream->event) { holder.http = switch_event_get_header(stream->event, "http-host"); } Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c Tue Dec 4 11:22:02 2007 @@ -364,6 +364,7 @@ char *fs_user = NULL, *fs_domain = NULL; char *path_info = NULL; abyss_bool ret = TRUE; + int html = 0; stream.data = r; stream.write_function = http_stream_write; @@ -371,6 +372,9 @@ if ((command = strstr(r->uri, "/api/"))) { command += 5; + } else if ((command = strstr(r->uri, "/webapi/"))) { + command += 8; + html++; } else { ret = FALSE; goto end; @@ -554,6 +558,10 @@ /* Generation of the server field */ ResponseAddField(r,"Server", "FreeSWITCH-" SWITCH_VERSION_FULL "-mod_xml_rpc"); + if (html) { + ResponseAddField(r, "Content-Type", "text/html"); + } + for (i=0;i<r->response_headers.size;i++) { ti=&r->response_headers.item[i]; ConnWrite(r->conn, ti->name, (uint32_t)strlen(ti->name)); @@ -566,6 +574,10 @@ snprintf(buf, sizeof(buf), "Connection: close\r\n"); ConnWrite(r->conn, buf, (uint32_t) strlen(buf)); + if (html) { + ConnWrite(r->conn, "\r\n", 2); + } + if (switch_api_execute(command, r->query, NULL, &stream) == SWITCH_STATUS_SUCCESS) { ResponseStatus(r, 200); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue Dec 4 11:22:02 2007 @@ -55,6 +55,53 @@ return total; } +SWITCH_DECLARE(char *) switch_amp_encode(char *s, char *buf, switch_size_t len) +{ + char *p, *q; + int x = 0; + assert(s); + + q = buf; + + for(p = s; x < len; p++) { + switch(*p) { + case '<': + if (x + 4 > len -1) { + goto end; + } + *q++ = '&'; + *q++ = 'l'; + *q++ = 't'; + *q++ = ';'; + x += 4; + break; + case '>': + if (x + 4 > len -1) { + goto end; + } + *q++ = '&'; + *q++ = 'g'; + *q++ = 't'; + *q++ = ';'; + x += 4; + break; + default: + if (x + 1 > len -1) { + goto end; + } + *q++ = *p; + x++; + if (*p == '\0') { + goto end; + } + break; + } + } + + end: + + return buf; +} static const char switch_b64_table[65] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";

1 0

[commit] r6490 - freeswitch/trunk/src/mod/endpoints/mod_alsa
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: mikej Date: Tue Dec 4 10:25:51 2007 New Revision: 6490 Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Log: remove unused dump from usage string (MODENDP-53) Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c Tue Dec 4 10:25:51 2007 @@ -1551,7 +1551,6 @@ const char *usage_string = "USAGE:\n" "--------------------------------------------------------------------------------\n" "alsa help\n" - "alsa dump\n" "alsa call <dest> [<dialplan> <cid_name> <cid_num> <rate>]\n" "alsa answer [<call_id>]\n" "alsa hangup [<call_id>]\n"

1 0

[commit] r6489 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: anthm Date: Tue Dec 4 08:48:20 2007 New Revision: 6489 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Dec 4 08:48:20 2007 @@ -1452,6 +1452,8 @@ data = switch_core_session_strdup(nsession, outbound_profile->destination_number); profile_name = data; + nchannel = switch_core_session_get_channel(nsession); + if (!strncasecmp(profile_name, "gateway", 7)) { char *gw; sofia_gateway_t *gateway_ptr = NULL; @@ -1485,7 +1487,9 @@ } profile = gateway_ptr->profile; - + tech_pvt->gateway_name = switch_core_session_strdup(nsession, gateway_ptr->name); + switch_channel_set_variable(nchannel, "sip_gateway_name", gateway_ptr->name); + if (!switch_test_flag(gateway_ptr, REG_FLAG_CALLERID)) { tech_pvt->gateway_from_str = switch_core_session_strdup(nsession, gateway_ptr->register_from); } @@ -1559,7 +1563,7 @@ sofia_glue_attach_private(nsession, profile, tech_pvt, dest); - nchannel = switch_core_session_get_channel(nsession); + if (tech_pvt->local_url) { switch_channel_set_variable(nchannel, "sip_local_url", tech_pvt->local_url); } Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Tue Dec 4 08:48:20 2007 @@ -318,6 +318,7 @@ char *call_id; char *invite_contact; char *local_url; + char *gateway_name; unsigned long rm_rate; switch_payload_t pt; switch_mutex_t *flag_mutex; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Tue Dec 4 08:48:20 2007 @@ -111,6 +111,9 @@ tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id); switch_channel_set_variable(channel, "sip_call_id", tech_pvt->call_id); } + if (tech_pvt->gateway_name) { + gateway = sofia_reg_find_gateway(tech_pvt->gateway_name); + } } else { /* too late */ return;

1 0

[commit] r6488 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: trixter Date: Tue Dec 4 06:55:33 2007 New Revision: 6488 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Log: doh! Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Tue Dec 4 06:55:33 2007 @@ -77,9 +77,15 @@ $this->_CDR[$this->currentTag][$this->_callflowcnt]['extension'][$key]=$value; } break; + case "originator": + if($this->_iscallflow) { + $this->currentTag = $name; + } else { + $this->_ElementName=$name; + } + break; case "caller_profile": case "times": - case "originator": case "originator_caller_profile": $this->currentTag = $name; break;

1 0

[commit] r6487 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: trixter Date: Tue Dec 4 06:46:52 2007 New Revision: 6487 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Log: minor fix Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Tue Dec 4 06:46:52 2007 @@ -79,6 +79,8 @@ break; case "caller_profile": case "times": + case "originator": + case "originator_caller_profile": $this->currentTag = $name; break; default: @@ -110,6 +112,15 @@ case "app_log": return; break; + case "originator_caller_profile": + if(isset($data) && $this->_ElementName != "" && + !isset($this->_CDR[$this->currentTag][$this->_ElementName]) + ) { + + $this->_CDR['callflow'][$this->_callflowcnt]['originator'][$this->currentTag][$this->_ElementName]=$data; + } + return; + break; case "caller_profile": case "times": if(isset($data) && $this->_ElementName != "" &&

1 0

[commit] r6486 - freeswitch/trunk/scripts/contrib/trixter/xml-cdr
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: trixter Date: Tue Dec 4 06:00:48 2007 New Revision: 6486 Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Log: New and improved, mirrors the structure of the XML more closely, use a print_r to test the output and see what is there and how its formatted Modified: freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php (original) +++ freeswitch/trunk/scripts/contrib/trixter/xml-cdr/Parse_XML_CDR.php Tue Dec 4 06:00:48 2007 @@ -7,8 +7,13 @@ var $_parser = 0; var $_showAttribs; var $_level = 0; + var $currentTag; + var $_CDR=array(); + var $_callflowcnt=0; + var $_iscallflow=0; function Parse_CDR_XML(&$data,$showattribs = false) { + $data = stripslashes(preg_replace('/<.xml (.*?)>(.*)/',"\\2",$data)); $data = preg_replace("/<(.*?)><(.*?)><\/(.*?)>/","<\\1>\\2</\\3>",$data); $this->_showAttribs = $showattribs; $this->_parser = xml_parser_create(); @@ -30,7 +35,7 @@ function & ReturnArray() { - return $this->_data[0]; + return $this->_CDR; } @@ -40,52 +45,88 @@ function _startElement($parser, $name, $attrs){ + $this->_ElementName=""; if (!isset($this->_rep[$name])) $this->_rep[$name] = 0; - if ($name != "cdr") { - $this->_addElement($name,$this->_data[$this->_level],$attrs,true); - $this->_name[$this->_level] = $name; - $this->_level++; + switch ($name) { + case "cdr": + break; + case "app_log": + case "variables": + if(!isset($this->_CDR[$name])) { + $this->_CDR[$name]=array(); + } + $this->currentTag = $name; + break; + case "application": + if($this->_iscallflow) { + $this->_CDR[$this->currentTag][$this->_callflowcnt]['extension']['application'][]=$attrs; + } else { + $this->_CDR[$this->currentTag][]=$attrs; + } + break; + case "callflow": + $this->_CDR[$name]=array(); + $this->currentTag = $name; + foreach ($attrs as $key => $value) { + $this->_CDR[$this->currentTag][$this->_callflowcnt][$key]=$value; + } + $this->_iscallflow=1; + break; + case "extension": + foreach ($attrs as $key => $value) { + $this->_CDR[$this->currentTag][$this->_callflowcnt]['extension'][$key]=$value; + } + break; + case "caller_profile": + case "times": + $this->currentTag = $name; + break; + default: + $this->_ElementName=$name; + break; } } function _endElement($parser,$name){ - if (isset($this->_name[$this->_level - 1])) { - if (isset($this->_data[$this->_level])){ - $this->_addElement($this->_name[$this->_level - 1],$this->_data[$this->_level - 1],$this->_data[$this->_level],false); - } - unset($this->_data[$this->_level]); - $this->_level--; - $this->_rep[$name]++; + $this->_ElementName=""; + switch ($name) { + case "callflow": + $this->_callflowcnt++; + $this->_iscallflow=0; + break; } + } function _cdata($parser, $data) { - if ($this->_name[$this->_level - 1]) { - $this->_addElement($this->_name[$this->_level - 1],$this->_data[$this->_level - 1],$data,false); + switch($this->currentTag) { + case "cdr": + return; + break; + case "app_log": + return; + break; + case "caller_profile": + case "times": + if(isset($data) && $this->_ElementName != "" && + !isset($this->_CDR[$this->currentTag][$this->_ElementName]) + ) { + + $this->_CDR['callflow'][$this->_callflowcnt][$this->currentTag][$this->_ElementName]=$data; + } + return; + break; } - } - - - function _addElement(&$name,&$start,$add = array(),$isattribs = false) { - if (((sizeof($add) == 0 && is_array($add)) || !$add) && !is_numeric($add)) { - if (!isset($start[$name])) $start[$name] = ''; - $add = ''; + if(isset($data) && $this->_ElementName != "" && + !isset($this->_CDR[$this->currentTag][$this->_ElementName]) + ) { + $this->_CDR[$this->currentTag][$this->_ElementName]=$data; } - - - $update = &$start[$name]; - - if ($isattribs && !$this->_showAttribs) return; - elseif ($isattribs) $this->_data['_Attributes_'][$this->_level][$name][] = $add; - elseif (is_array($add) && is_array($update)) $update += $add; - elseif (is_array($update)) return; - elseif (is_array($add)) $update = $add; - elseif ($add || is_numeric($add)) $update .= "$add"; } - + } ?>

1 0

[commit] r6485 - freeswitch/trunk/src
by Freeswitch SVN 04 Dec '07

04 Dec '07

Author: mikej Date: Mon Dec 3 22:43:32 2007 New Revision: 6485 Modified: freeswitch/trunk/src/switch_utils.c Log: add inet_ntop replacement function. Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Mon Dec 3 22:43:32 2007 @@ -668,6 +668,186 @@ static char RFC2833_CHARS[] = "0123456789*#ABCDF"; +#ifdef _MSC_VER +/* Copyright (c) 1996 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#include <ctype.h> +#include <errno.h> +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include <sys/types.h> + +/* + * WARNING: Don't even consider trying to compile this on a system where + * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. + */ + +static const char *inet_ntop4(const unsigned char *src, char *dst, size_t size); +#if HAVE_SIN6 +static const char *inet_ntop6(const unsigned char *src, char *dst, size_t size); +#endif + +/* char * + * inet_ntop(af, src, dst, size) + * convert a network format address to presentation format. + * return: + * pointer to presentation format address (`dst'), or NULL (see errno). + * author: + * Paul Vixie, 1996. + */ +const char * +inet_ntop(int af, void const *src, char *dst, size_t size) +{ + + switch (af) { + case AF_INET: + return inet_ntop4(src, dst, size); +#if HAVE_SIN6 + case AF_INET6: + return inet_ntop6(src, dst, size); +#endif + default: + return NULL; + } + /* NOTREACHED */ +} + +/* const char * + * inet_ntop4(src, dst, size) + * format an IPv4 address, more or less like inet_ntoa() + * return: + * `dst' (as a const) + * notes: + * (1) uses no statics + * (2) takes a unsigned char* not an in_addr as input + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop4(const unsigned char *src, char *dst, size_t size) +{ + static const char fmt[] = "%u.%u.%u.%u"; + char tmp[sizeof "255.255.255.255"]; + + if (snprintf(tmp, sizeof tmp, fmt, + src[0], src[1], src[2], src[3]) >= (int)size) { + return NULL; + } + + return strcpy(dst, tmp); +} + +#if HAVE_SIN6 +/* const char * + * inet_ntop6(src, dst, size) + * convert IPv6 binary address into presentation (printable) format + * author: + * Paul Vixie, 1996. + */ +static const char * +inet_ntop6(unsigned char const *src, char *dst, size_t size) +{ + /* + * Note that int32_t and int16_t need only be "at least" large enough + * to contain a value of the specified size. On some systems, like + * Crays, there is no such thing as an integer variable with 16 bits. + * Keep this in mind if you think this function should have been coded + * to use pointer overlays. All the world's not a VAX. + */ + char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; + struct { int base, len; } best = { -1 , 0 }, cur = { -1, 0 }; + unsigned int words[8]; + int i; + + /* + * Preprocess: + * Copy the input (bytewise) array into a wordwise array. + * Find the longest run of 0x00's in src[] for :: shorthanding. + */ + for (i = 0; i < 16; i += 2) + words[i / 2] = (src[i] << 8) | (src[i + 1]); + best.base = -1; + cur.base = -1; + for (i = 0; i < 8; i++) { + if (words[i] == 0) { + if (cur.base == -1) + cur.base = i, cur.len = 1; + else + cur.len++; + } else { + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + cur.base = -1; + } + } + } + if (cur.base != -1) { + if (best.base == -1 || cur.len > best.len) + best = cur; + } + if (best.base != -1 && best.len < 2) + best.base = -1; + + /* + * Format the result. + */ + tp = tmp; + for (i = 0; i < 8; i++) { + /* Are we inside the best run of 0x00's? */ + if (best.base != -1 && i >= best.base && + i < (best.base + best.len)) { + if (i == best.base) + *tp++ = ':'; + continue; + } + /* Are we following an initial run of 0x00s or any real hex? */ + if (i != 0) + *tp++ = ':'; + /* Is this address an encapsulated IPv4? */ + if (i == 6 && best.base == 0 && + (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { + if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) + return (NULL); + tp += strlen(tp); + break; + } + tp += sprintf(tp, "%x", words[i]); + } + /* Was it a trailing run of 0x00's? */ + if (best.base != -1 && (best.base + best.len) == 8) + *tp++ = ':'; + *tp++ = '\0'; + + /* + * Check for overflow, copy, and we're done. + */ + if ((size_t)(tp - tmp) >= size) { + return NULL; + } + + return strcpy(dst, tmp); +} +#endif + +#endif + SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in) { assert(buf);

1 0