kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-15 12:42:40 +00:00
Code Issues Projects Releases Wiki Activity

FS-7767 #resolve

Browse Source
This commit is contained in:
Brian West 2015-07-02 13:18:56 -05:00
parent ff9877586b
commit 41067cc7b7
1 changed files with 59 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/mod/endpoints/mod_sofia/sip-dig.c
View File

@ -215,10 +215,13 @@ switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_cor
char const *string; char const *string;
url_t *uri = NULL; url_t *uri = NULL;
#define DIG_MAX_ARGS 50
char const *host; char const *host;
char const *port; char const *port;
char *transport = NULL, tport[32]; char *transport = NULL, tport[32];
char *argv_[25] = { 0 }; char *argv_[DIG_MAX_ARGS + 1] = { 0 };
int argc;
int i;
char *mycmd = NULL; char *mycmd = NULL;
char **argv; char **argv;
struct dig dig[1] = {{ NULL }}; struct dig dig[1] = {{ NULL }};
@ -230,81 +233,81 @@ switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_cor
argv = argv_; argv = argv_;
argv++; argv++;
if (!cmd) { if (zstr(cmd)) {
{usage(1);} usage(1);
} }
mycmd = strdup(cmd); mycmd = strdup(cmd);
switch_separate_string(mycmd, ' ', argv, (sizeof(argv_) / sizeof(argv_[0])) - 1); argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv_) / sizeof(argv_[0])) - 1);
argv = argv_; argv = argv_;
argc++;
argv[0] = "sofia_dig";
i = 1;
if (argc < 2 || argc == (DIG_MAX_ARGS + 1)) {
if (!argv[1]) { usage(1);
{usage(1);}
} }
if (!strcasecmp(argv[1], "xml")) { if (!strcasecmp(argv[i], "xml")) {
switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "xml", "true"); switch_event_add_header_string(stream->param_event, SWITCH_STACK_BOTTOM, "xml", "true");
argv++; i++;
xml++; xml++;
} }
argv[0] = "sofia_dig"; while (argv[i] && argv[i][0] == '-') {
if (strcmp(argv[i], "-v") == 0) {
//if (su_init() != 0)
//return -1;
while (argv[1] && argv[1][0] == '-') {
if (strcmp(argv[1], "-v") == 0)
o_verbatim++; o_verbatim++;
else if (strcmp(argv[1], "-6") == 0) } else if (strcmp(argv[i], "-6") == 0) {
dig->ip6 = ++family; dig->ip6 = ++family;
else if (strcmp(argv[1], "-4") == 0) } else if (strcmp(argv[i], "-4") == 0) {
dig->ip4 = ++family; dig->ip4 = ++family;
else if (strncmp(argv[1], "-p", 2) == 0) { } else if (strncmp(argv[i], "-p", 2) == 0) {
char const *proto; char const *proto;
if (argv[1][2] == '=') if (argv[i][2] == '=') {
proto = argv[1] + 3; proto = argv[i] + 3;
else if (argv[1][2]) } else if (argv[i][2]) {
proto = argv[1] + 2; proto = argv[i] + 2;
else } else {
proto = argv++[2]; i++;
proto = argv[i];
}
if (proto == NULL) if (proto == NULL) {
{usage(2);} usage(2);
}
if (prepare_transport(dig, proto) < 0) { if (prepare_transport(dig, proto) < 0) {
goto fail; goto fail;
} }
} } else if (strcmp(argv[i], "--udp") == 0) {
else if (strcmp(argv[1], "--udp") == 0)
prepare_transport(dig, "udp"); prepare_transport(dig, "udp");
else if (strcmp(argv[1], "--tcp") == 0) } else if (strcmp(argv[i], "--tcp") == 0) {
prepare_transport(dig, "tcp"); prepare_transport(dig, "tcp");
else if (strcmp(argv[1], "--tls") == 0) } else if (strcmp(argv[i], "--tls") == 0) {
prepare_transport(dig, "tls"); prepare_transport(dig, "tls");
else if (strcmp(argv[1], "--sctp") == 0) } else if (strcmp(argv[i], "--sctp") == 0) {
prepare_transport(dig, "sctp"); prepare_transport(dig, "sctp");
else if (strcmp(argv[1], "--tls-sctp") == 0) } else if (strcmp(argv[i], "--tls-sctp") == 0) {
prepare_transport(dig, "tls-sctp"); prepare_transport(dig, "tls-sctp");
else if (strcmp(argv[1], "--tls-udp") == 0) } else if (strcmp(argv[i], "--tls-udp") == 0) {
prepare_transport(dig, "tls-udp"); prepare_transport(dig, "tls-udp");
else if (strcmp(argv[1], "--no-sctp") == 0) } else if (strcmp(argv[i], "--no-sctp") == 0) {
o_sctp = 0, o_tls_sctp = 0; o_sctp = 0, o_tls_sctp = 0;
else if (strcmp(argv[1], "--help") == 0) } else if (strcmp(argv[i], "--help") == 0) {
{usage(0);} usage(0);
else if (strcmp(argv[1], "-h") == 0) } else if (strcmp(argv[i], "-h") == 0) {
{usage(0);} usage(0);
else if (strcmp(argv[1], "-?") == 0) } else if (strcmp(argv[i], "-?") == 0) {
{usage(0);} usage(0);
else if (strcmp(argv++[1], "-") == 0) } else if (strcmp(argv[i], "-") == 0) {
i++;
break; break;
else } else {
{usage(2);} usage(2);
argv++; }
i++;
} }
@ -319,11 +322,11 @@ switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_cor
dig->ip4 = 1, dig->ip6 = 2; dig->ip4 = 1, dig->ip6 = 2;
if (!argv[1]) if (!argv[i]) {
{usage(2);} usage(2);
}
multiple = argv[i] && argv[i +1];
multiple = argv[1] && argv[2];
if (!count_transports(dig, NULL, NULL)) { if (!count_transports(dig, NULL, NULL)) {
prepare_transport(dig, "udp"); prepare_transport(dig, "udp");
@ -336,10 +339,12 @@ switch_status_t sip_dig_function(_In_opt_z_ const char *cmd, _In_opt_ switch_cor
} }
dig->sres = sres_resolver_new(getenv("SRESOLV_CONF")); dig->sres = sres_resolver_new(getenv("SRESOLV_CONF"));
if (!dig->sres)
{usage(1);}
for (; (string = argv[1]); argv++) { if (!dig->sres) {
usage(1);
}
for (; i <= argc && (string = argv[i]); i++) {
if (multiple) if (multiple)
stream->write_function(stream, "%s", string); stream->write_function(stream, "%s", string);