spring cleaning

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4795 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2007-03-29 22:31:56 +00:00
parent a021945cef
commit 3a54126261
143 changed files with 22413 additions and 31567 deletions

View File

@@ -36,216 +36,204 @@
SWITCH_DECLARE(switch_status_t) switch_find_local_ip(char *buf, int len, int family)
{
switch_status_t status = SWITCH_STATUS_FALSE;
char *base;
switch_status_t status = SWITCH_STATUS_FALSE;
char *base;
#ifdef WIN32
SOCKET tmp_socket;
SOCKADDR_STORAGE l_address;
int l_address_len;
struct addrinfo *address_info;
SOCKET tmp_socket;
SOCKADDR_STORAGE l_address;
int l_address_len;
struct addrinfo *address_info;
#else
#ifdef __Darwin__
int ilen;
int ilen;
#else
unsigned int ilen;
unsigned int ilen;
#endif
int tmp_socket = -1, on = 1;
char abuf[25] = "";
int tmp_socket = -1, on = 1;
char abuf[25] = "";
#endif
switch_copy_string(buf, "127.0.0.1", len);
switch_copy_string(buf, "127.0.0.1", len);
switch(family) {
case AF_INET:
base = "82.45.148.209";
break;
case AF_INET6:
base = "52.2d.94.d1";
break;
switch (family) {
case AF_INET:
base = "82.45.148.209";
break;
case AF_INET6:
base = "52.2d.94.d1";
break;
default:
base = "127.0.0.1";
break;
}
}
#ifdef WIN32
tmp_socket = socket(family, SOCK_DGRAM, 0);
tmp_socket = socket(family, SOCK_DGRAM, 0);
getaddrinfo(base, NULL, NULL, &address_info);
if (WSAIoctl(tmp_socket,
SIO_ROUTING_INTERFACE_QUERY,
address_info->ai_addr,
(DWORD)address_info->ai_addrlen,
&l_address,
sizeof(l_address),
(LPDWORD)&l_address_len,
NULL,
NULL)) {
closesocket(tmp_socket);
freeaddrinfo(address_info);
return status;
}
closesocket(tmp_socket);
freeaddrinfo(address_info);
if(!getnameinfo((const struct sockaddr*)&l_address,
l_address_len,
buf,
len,
NULL,
0,
NI_NUMERICHOST)) {
getaddrinfo(base, NULL, NULL, &address_info);
status = SWITCH_STATUS_SUCCESS;
}
if (WSAIoctl(tmp_socket,
SIO_ROUTING_INTERFACE_QUERY,
address_info->ai_addr,
(DWORD) address_info->ai_addrlen,
&l_address, sizeof(l_address), (LPDWORD) & l_address_len, NULL, NULL)) {
closesocket(tmp_socket);
freeaddrinfo(address_info);
return status;
}
closesocket(tmp_socket);
freeaddrinfo(address_info);
if (!getnameinfo((const struct sockaddr *) &l_address, l_address_len, buf, len, NULL, 0, NI_NUMERICHOST)) {
status = SWITCH_STATUS_SUCCESS;
}
#else
switch(family) {
case AF_INET:
{
struct sockaddr_in iface_out;
struct sockaddr_in remote;
memset (&remote, 0, sizeof (struct sockaddr_in));
switch (family) {
case AF_INET:
{
struct sockaddr_in iface_out;
struct sockaddr_in remote;
memset(&remote, 0, sizeof(struct sockaddr_in));
remote.sin_family = AF_INET;
remote.sin_addr.s_addr = inet_addr (base);
remote.sin_port = htons (4242);
remote.sin_family = AF_INET;
remote.sin_addr.s_addr = inet_addr(base);
remote.sin_port = htons(4242);
memset (&iface_out, 0, sizeof (iface_out));
tmp_socket = socket (AF_INET, SOCK_DGRAM, 0);
if (setsockopt (tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) {
goto doh;
}
memset(&iface_out, 0, sizeof(iface_out));
tmp_socket = socket(AF_INET, SOCK_DGRAM, 0);
if (connect (tmp_socket, (struct sockaddr *) &remote, sizeof (struct sockaddr_in)) == -1) {
goto doh;
}
if (setsockopt(tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) == -1) {
goto doh;
}
ilen = sizeof (iface_out);
if (getsockname (tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
goto doh;
}
if (connect(tmp_socket, (struct sockaddr *) &remote, sizeof(struct sockaddr_in)) == -1) {
goto doh;
}
if (iface_out.sin_addr.s_addr == 0) {
goto doh;
}
switch_copy_string(buf, get_addr(abuf, sizeof(abuf), &iface_out.sin_addr), len);
status = SWITCH_STATUS_SUCCESS;
}
break;
case AF_INET6:
{
struct sockaddr_in6 iface_out;
struct sockaddr_in6 remote;
memset (&remote, 0, sizeof (struct sockaddr_in6));
ilen = sizeof(iface_out);
if (getsockname(tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
goto doh;
}
remote.sin6_family = AF_INET6;
inet_pton (AF_INET6, buf, &remote.sin6_addr);
remote.sin6_port = htons (4242);
if (iface_out.sin_addr.s_addr == 0) {
goto doh;
}
memset (&iface_out, 0, sizeof (iface_out));
tmp_socket = socket (AF_INET6, SOCK_DGRAM, 0);
switch_copy_string(buf, get_addr(abuf, sizeof(abuf), &iface_out.sin_addr), len);
status = SWITCH_STATUS_SUCCESS;
}
break;
case AF_INET6:
{
struct sockaddr_in6 iface_out;
struct sockaddr_in6 remote;
memset(&remote, 0, sizeof(struct sockaddr_in6));
if (setsockopt (tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof (on)) == -1) {
goto doh;
}
remote.sin6_family = AF_INET6;
inet_pton(AF_INET6, buf, &remote.sin6_addr);
remote.sin6_port = htons(4242);
if (connect (tmp_socket, (struct sockaddr *) &remote, sizeof (struct sockaddr_in)) == -1) {
goto doh;
}
memset(&iface_out, 0, sizeof(iface_out));
tmp_socket = socket(AF_INET6, SOCK_DGRAM, 0);
ilen = sizeof (iface_out);
if (getsockname (tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
goto doh;
}
if (iface_out.sin6_addr.s6_addr == 0) {
goto doh;
}
if (setsockopt(tmp_socket, SOL_SOCKET, SO_BROADCAST, &on, sizeof(on)) == -1) {
goto doh;
}
inet_ntop (AF_INET6, (const void *) &iface_out.sin6_addr, buf, len - 1);
status = SWITCH_STATUS_SUCCESS;
}
break;
}
if (connect(tmp_socket, (struct sockaddr *) &remote, sizeof(struct sockaddr_in)) == -1) {
goto doh;
}
ilen = sizeof(iface_out);
if (getsockname(tmp_socket, (struct sockaddr *) &iface_out, &ilen) == -1) {
goto doh;
}
if (iface_out.sin6_addr.s6_addr == 0) {
goto doh;
}
inet_ntop(AF_INET6, (const void *) &iface_out.sin6_addr, buf, len - 1);
status = SWITCH_STATUS_SUCCESS;
}
break;
}
doh:
if (tmp_socket > 0) {
close (tmp_socket);
tmp_socket = -1;
}
doh:
if (tmp_socket > 0) {
close(tmp_socket);
tmp_socket = -1;
}
#endif
return status;
return status;
}
SWITCH_DECLARE(switch_time_t) switch_str_time(char *in)
{
switch_time_exp_t tm = {0};
int proceed = 0, ovector[30];
switch_regex_t *re = NULL;
char replace[1024] = "";
switch_time_t ret = 0;
char *pattern = "^(\\d+)-(\\d+)-(\\d+)\\s*(\\d*):{0,1}(\\d*):{0,1}(\\d*)";
switch_time_exp_t tm = { 0 };
int proceed = 0, ovector[30];
switch_regex_t *re = NULL;
char replace[1024] = "";
switch_time_t ret = 0;
char *pattern = "^(\\d+)-(\\d+)-(\\d+)\\s*(\\d*):{0,1}(\\d*):{0,1}(\\d*)";
switch_time_exp_lt(&tm, switch_time_now());
tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
switch_time_exp_lt(&tm, switch_time_now());
tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = 0;
if ((proceed = switch_regex_perform(in, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
if ((proceed = switch_regex_perform(in, pattern, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
if (proceed > 1) {
switch_regex_copy_substring(in, ovector, proceed, 1, replace, sizeof(replace));
tm.tm_year = atoi(replace) - 1900;
}
if (proceed > 1) {
switch_regex_copy_substring(in, ovector, proceed, 1, replace, sizeof(replace));
tm.tm_year = atoi(replace) - 1900;
}
if (proceed > 2) {
switch_regex_copy_substring(in, ovector, proceed, 2, replace, sizeof(replace));
tm.tm_mon = atoi(replace) - 1;
}
if (proceed > 2) {
switch_regex_copy_substring(in, ovector, proceed, 2, replace, sizeof(replace));
tm.tm_mon = atoi(replace) - 1;
}
if (proceed > 3) {
switch_regex_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace));
tm.tm_mday = atoi(replace);
}
if (proceed > 4) {
switch_regex_copy_substring(in, ovector, proceed, 4, replace, sizeof(replace));
tm.tm_hour = atoi(replace);
}
if (proceed > 3) {
switch_regex_copy_substring(in, ovector, proceed, 3, replace, sizeof(replace));
tm.tm_mday = atoi(replace);
}
if (proceed > 5) {
switch_regex_copy_substring(in, ovector, proceed, 5, replace, sizeof(replace));
tm.tm_min = atoi(replace);
}
if (proceed > 4) {
switch_regex_copy_substring(in, ovector, proceed, 4, replace, sizeof(replace));
tm.tm_hour = atoi(replace);
}
if (proceed > 6) {
switch_regex_copy_substring(in, ovector, proceed, 6, replace, sizeof(replace));
tm.tm_sec = atoi(replace);
}
if (proceed > 5) {
switch_regex_copy_substring(in, ovector, proceed, 5, replace, sizeof(replace));
tm.tm_min = atoi(replace);
}
switch_time_exp_gmt_get(&ret, &tm);
return ret;
} /* possible else with more patterns later */
return ret;
if (proceed > 6) {
switch_regex_copy_substring(in, ovector, proceed, 6, replace, sizeof(replace));
tm.tm_sec = atoi(replace);
}
switch_time_exp_gmt_get(&ret, &tm);
return ret;
}
/* possible else with more patterns later */
return ret;
}
SWITCH_DECLARE(char *) switch_priority_name(switch_priority_t priority)
{
switch(priority) { /*lol*/
switch (priority) { /*lol */
case SWITCH_PRIORITY_NORMAL:
return "NORMAL";
case SWITCH_PRIORITY_LOW:
@@ -268,7 +256,7 @@ SWITCH_DECLARE(char *) get_addr(char *buf, switch_size_t len, struct in_addr *in
i = (uint8_t *) in;
memset(buf, 0, len);
for(x =0; x < 4; x++) {
for (x = 0; x < 4; x++) {
sprintf(p, "%u%s", i[x], x == 3 ? "" : ".");
p = buf + strlen(buf);
}
@@ -285,55 +273,55 @@ SWITCH_DECLARE(char) switch_rfc2833_to_char(int event)
SWITCH_DECLARE(unsigned char) switch_char_to_rfc2833(char key)
{
char *c;
char *c;
unsigned char counter = 0;
key = (char)toupper(key);
for (c = RFC2833_CHARS; *c ; c++) {
if (*c == key) {
return counter;
}
key = (char) toupper(key);
for (c = RFC2833_CHARS; *c; c++) {
if (*c == key) {
return counter;
}
counter++;
}
return '\0';
return '\0';
}
SWITCH_DECLARE(char *) switch_escape_char(switch_memory_pool_t *pool, char *in, char *delim, char esc)
{
char *data, *p, *d;
int count = 1, i = 0;
char *data, *p, *d;
int count = 1, i = 0;
p = in;
while(*p) {
d = delim;
while (*d) {
if (*p == *d) {
count++;
}
d++;
}
p++;
}
p = in;
while (*p) {
d = delim;
while (*d) {
if (*p == *d) {
count++;
}
d++;
}
p++;
}
if (count == 1) {
return in;
}
data = switch_core_alloc(pool, strlen(in) + count);
p = in;
while(*p) {
d = delim;
while (*d) {
if (*p == *d) {
data[i++] = esc;
}
d++;
}
data[i++] = *p;
p++;
}
return data;
p = in;
while (*p) {
d = delim;
while (*d) {
if (*p == *d) {
data[i++] = esc;
}
d++;
}
data[i++] = *p;
p++;
}
return data;
}
@@ -375,7 +363,7 @@ SWITCH_DECLARE(unsigned int) switch_separate_string(char *buf, char delim, char
}
/* strip quotes */
for(x = 0; x < argc; x++) {
for (x = 0; x < argc; x++) {
if (*(array[x]) == qc) {
(array[x])++;
if ((e = strchr(array[x], qc))) {
@@ -407,7 +395,8 @@ SWITCH_DECLARE(const char *) switch_cut_path(const char *in)
}
SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search, size_t search_len)
SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t string_len, const char *search,
size_t search_len)
{
size_t i;
@@ -415,8 +404,8 @@ SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t s
if (string[i] != search[i]) {
return SWITCH_STATUS_FALSE;
}
}
}
if (i == search_len) {
return SWITCH_STATUS_SUCCESS;
}
@@ -432,21 +421,21 @@ SWITCH_DECLARE(char *) switch_string_replace(const char *string, const char *sea
size_t i, n;
size_t dest_len = 0;
char *dest;
dest = (char *)malloc(sizeof(char));
dest = (char *) malloc(sizeof(char));
for (i = 0; i < string_len; i++) {
if (switch_string_match(string + i, string_len - i, search, search_len) == SWITCH_STATUS_SUCCESS) {
for (n = 0; n < replace_len; n++) {
dest[dest_len] = replace[n];
dest_len++;
dest = (char *)realloc(dest, sizeof(char)*(dest_len+1));
dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1));
}
i += search_len-1;
i += search_len - 1;
} else {
dest[dest_len] = string[i];
dest_len++;
dest = (char *)realloc(dest, sizeof(char)*(dest_len+1));
dest = (char *) realloc(dest, sizeof(char) * (dest_len + 1));
}
}
@@ -466,37 +455,37 @@ SWITCH_DECLARE(int) switch_socket_waitfor(switch_pollfd_t *poll, int ms)
SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len)
{
char *p;
size_t x = 0;
const char urlunsafe[] = "\r\n \"#%&+:;<=>?@[\\]^`{|}";
const char hex[] = "0123456789ABCDEF";
char *p;
size_t x = 0;
const char urlunsafe[] = "\r\n \"#%&+:;<=>?@[\\]^`{|}";
const char hex[] = "0123456789ABCDEF";
if (!buf) {
return 0;
}
memset(buf, 0, len);
memset(buf, 0, len);
if (!url) {
return 0;
}
for( p = url ; *p ; p++) {
if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) {
if ((x + 3) > len) {
break;
}
buf[x++] = '%';
buf[x++] = hex[*p >> 4];
buf[x++] = hex[*p & 0x0f];
} else {
buf[x++] = *p;
}
if (x == len) {
break;
}
}
return x;
for (p = url; *p; p++) {
if (*p < ' ' || *p > '~' || strchr(urlunsafe, *p)) {
if ((x + 3) > len) {
break;
}
buf[x++] = '%';
buf[x++] = hex[*p >> 4];
buf[x++] = hex[*p & 0x0f];
} else {
buf[x++] = *p;
}
if (x == len) {
break;
}
}
return x;
}
SWITCH_DECLARE(char *) switch_url_decode(char *s)
@@ -506,7 +495,7 @@ SWITCH_DECLARE(char *) switch_url_decode(char *s)
for (o = s; *s; s++, o++) {
if (*s == '%' && strlen(s) > 2 && sscanf(s + 1, "%2x", &tmp) == 1) {
*o = (char)tmp;
*o = (char) tmp;
s += 2;
} else {
*o = *s;