[Freeswitch-svn] [commit] r12833 - freeswitch/trunk/src/mod/endpoints/mod_skypiax
FreeSWITCH SVN
gmaruzz at freeswitch.org
Sun Mar 29 02:21:07 PDT 2009
Author: gmaruzz
Date: Sun Mar 29 04:21:07 2009
New Revision: 12833
Log:
skypiax: indent -gnu -ts4 -br -brs -cdw -lp -ce -nbfda -npcs -nprs -npsl -nbbo -saf -sai -saw -cs -bbo -nhnl -nut -sob -l90
Modified:
freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c Sun Mar 29 04:21:07 2009
@@ -40,9 +40,9 @@
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skypiax_shutdown);
SWITCH_MODULE_DEFINITION(mod_skypiax, mod_skypiax_load, mod_skypiax_shutdown, NULL);
SWITCH_STANDARD_API(sk_function);
-#define SK_SYNTAX "list || console || skype_API_msg"
+#define SK_SYNTAX "list || console || skype_API_msg"
SWITCH_STANDARD_API(skypiax_function);
-#define SKYPIAX_SYNTAX "interface_name skype_API_msg"
+#define SKYPIAX_SYNTAX "interface_name skype_API_msg"
static struct {
int debug;
@@ -664,10 +664,10 @@
}
tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
memset(tech_pvt->session_uuid_str, '\0', sizeof(tech_pvt->session_uuid_str));
- } else {
+ } else {
ERRORA("no tech_pvt?\n", SKYPIAX_P_LOG);
- }
- }
+ }
+ }
}
return NULL;
}
@@ -1026,7 +1026,7 @@
SWITCH_MODULE_LOAD_FUNCTION(mod_skypiax_load)
{
skypiax_module_pool = pool;
- switch_api_interface_t *commands_api_interface;
+ switch_api_interface_t *commands_api_interface;
memset(&globals, '\0', sizeof(globals));
@@ -1044,14 +1044,15 @@
skypiax_endpoint_interface->io_routines = &skypiax_io_routines;
skypiax_endpoint_interface->state_handler = &skypiax_state_handlers;
- if (running){
+ if (running) {
- SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function, SK_SYNTAX);
- SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands", skypiax_function, SKYPIAX_SYNTAX);
+ SWITCH_ADD_API(commands_api_interface, "sk", "Skypiax console commands", sk_function,
+ SK_SYNTAX);
+ SWITCH_ADD_API(commands_api_interface, "skypiax", "Skypiax interface commands",
+ skypiax_function, SKYPIAX_SYNTAX);
/* indicate that the module should continue to be loaded */
return SWITCH_STATUS_SUCCESS;
- }
- else
+ } else
return SWITCH_STATUS_FALSE;
}
@@ -1129,10 +1130,12 @@
{
return skypiax_do_tcp_srv_thread_func(obj);
}
+
void *SWITCH_THREAD_FUNC skypiax_do_tcp_cli_thread(switch_thread_t * thread, void *obj)
{
return skypiax_do_tcp_cli_thread_func(obj);
}
+
void *SWITCH_THREAD_FUNC skypiax_do_skypeapi_thread(switch_thread_t * thread, void *obj)
{
return skypiax_do_skypeapi_thread_func(obj);
@@ -1231,20 +1234,20 @@
session = switch_core_session_locate(tech_pvt->session_uuid_str);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (session) {
channel = switch_core_session_get_channel(session);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (channel) {
switch_channel_mark_ring_ready(channel);
DEBUGA_SKYPE("skype_call: REMOTE PARTY RINGING\n", SKYPIAX_P_LOG);
} else {
ERRORA("No channel???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
switch_core_session_rwunlock(session);
@@ -1262,21 +1265,21 @@
session = switch_core_session_locate(tech_pvt->session_uuid_str);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (session) {
channel = switch_core_session_get_channel(session);
switch_core_session_add_stream(session, NULL);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (channel) {
switch_channel_mark_pre_answered(channel);
NOTICA("skype_call: REMOTE PARTY EARLY MEDIA\n", SKYPIAX_P_LOG);
} else {
ERRORA("No channel???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
switch_core_session_rwunlock(session);
@@ -1294,20 +1297,20 @@
session = switch_core_session_locate(tech_pvt->session_uuid_str);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (session) {
channel = switch_core_session_get_channel(session);
} else {
ERRORA("No session???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
if (channel) {
switch_channel_mark_answered(channel);
//DEBUGA_SKYPE("skype_call: %s, answered\n", SKYPIAX_P_LOG, id);
} else {
ERRORA("No channel???\n", SKYPIAX_P_LOG);
- goto done;
+ goto done;
}
switch_core_session_rwunlock(session);
@@ -1347,136 +1350,139 @@
SWITCH_STANDARD_API(sk_function)
{
- char *mycmd = NULL, *argv[10] = { 0 };
- int argc = 0;
+ char *mycmd = NULL, *argv[10] = { 0 };
+ int argc = 0;
+
+ if (globals.sk_console)
+ stream->write_function(stream, "sk console is: |||%s|||\n", globals.sk_console->name);
+ else
+ stream->write_function(stream, "sk console is NOT yet assigned\n");
+
+ if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (!argc) {
+ stream->write_function(stream, "%s", SK_SYNTAX);
+ goto end;
+ }
+
+ if (!strcasecmp(argv[0], "list")) {
+ int i;
+ for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
+ if (strlen(globals.SKYPIAX_INTERFACES[i].name)) {
+ if (strlen(globals.SKYPIAX_INTERFACES[i].session_uuid_str)) {
+ stream->write_function(stream,
+ "globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tBUSY, session_uuid_str=|||%s|||\n",
+ i, globals.SKYPIAX_INTERFACES[i].name,
+ globals.SKYPIAX_INTERFACES[i].session_uuid_str);
+ } else {
+ stream->write_function(stream,
+ "globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tIDLE\n",
+ i, globals.SKYPIAX_INTERFACES[i].name);
+ }
+ }
+ }
+ } else if (!strcasecmp(argv[0], "console")) {
+ int i;
+ int found = 0;
+
+ if (argc == 2) {
+ for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
+ /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
+ if (strlen(globals.SKYPIAX_INTERFACES[i].name)
+ && (strncmp(globals.SKYPIAX_INTERFACES[i].name, argv[1], strlen(argv[1])) ==
+ 0)) {
+ globals.sk_console = &globals.SKYPIAX_INTERFACES[i];
+ stream->write_function(stream,
+ "sk console is now: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n",
+ i, globals.SKYPIAX_INTERFACES[i].name);
+ stream->write_function(stream, "sk console is: |||%s|||\n",
+ globals.sk_console->name);
+ found = 1;
+ break;
+ }
+
+ }
+ if (!found)
+ stream->write_function(stream,
+ "ERROR: A Skypiax interface with name='%s' was not found\n",
+ argv[1]);
+ } else {
+
+ stream->write_function(stream, "-ERR Usage: sk console interface_name\n");
+ goto end;
+ }
+
+ } else if (!strcasecmp(argv[0], "ciapalino")) {
- if(globals.sk_console)
- stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name);
- else
- stream->write_function(stream,"sk console is NOT yet assigned\n");
-
-
- if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
- argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
- }
-
- if (!argc) {
- stream->write_function(stream, "%s", SK_SYNTAX);
- goto end;
- }
-
- if (!strcasecmp(argv[0], "list")) {
- int i;
- for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) {
- if (strlen(globals.SKYPIAX_INTERFACES[i].name)) {
- if (strlen(globals.SKYPIAX_INTERFACES[i].session_uuid_str)) {
- stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tBUSY, session_uuid_str=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name, globals.SKYPIAX_INTERFACES[i].session_uuid_str);
- } else {
- stream->write_function(stream,"globals.SKYPIAX_INTERFACES[%d].name=\t|||%s||| is \tIDLE\n", i, globals.SKYPIAX_INTERFACES[i].name);
- }
- }
- }
- } else if (!strcasecmp(argv[0], "console")) {
- int i;
- int found =0;
-
- if (argc == 2) {
- for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
- /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
- if (strlen(globals.SKYPIAX_INTERFACES[i].name)
- &&
- (strncmp
- (globals.SKYPIAX_INTERFACES[i].name, argv[1],
- strlen(argv[1])) == 0)) {
- globals.sk_console=&globals.SKYPIAX_INTERFACES[i];
- stream->write_function(stream,"sk console is now: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name);
- stream->write_function(stream,"sk console is: |||%s|||\n", globals.sk_console->name);
- found = 1;
- break;
- }
-
- }
- if(!found)
- stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[1]);
- } else {
-
- stream->write_function(stream, "-ERR Usage: sk console interface_name\n");
- goto end;
- }
-
-
- } else if (!strcasecmp(argv[0], "ciapalino")) {
-
- } else {
- if(globals.sk_console)
- skypiax_signaling_write(globals.sk_console, (char *)cmd);
- else
- stream->write_function(stream,"sk console is NOT yet assigned\n");
- }
+ } else {
+ if (globals.sk_console)
+ skypiax_signaling_write(globals.sk_console, (char *) cmd);
+ else
+ stream->write_function(stream, "sk console is NOT yet assigned\n");
+ }
end:
- switch_safe_free(mycmd);
+ switch_safe_free(mycmd);
- return SWITCH_STATUS_SUCCESS;
+ return SWITCH_STATUS_SUCCESS;
}
SWITCH_STANDARD_API(skypiax_function)
{
- char *mycmd = NULL, *argv[10] = { 0 };
- int argc = 0;
- private_t *tech_pvt=NULL;
-
-
- if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
- argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
- }
-
- if (!argc) {
- stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
- goto end;
- }
-
- if (argc < 2) {
- stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
- goto end;
- }
-
- if (argv[0]) {
- int i;
- int found =0;
-
- for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
- /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
- if (strlen(globals.SKYPIAX_INTERFACES[i].name)
- &&
- (strncmp
- (globals.SKYPIAX_INTERFACES[i].name, argv[0],
- strlen(argv[0])) == 0)) {
- tech_pvt=&globals.SKYPIAX_INTERFACES[i];
- stream->write_function(stream,"Using interface: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n", i, globals.SKYPIAX_INTERFACES[i].name);
- found = 1;
- break;
- }
-
- }
- if(!found){
- stream->write_function(stream,"ERROR: A Skypiax interface with name='%s' was not found\n", argv[0]);
- switch_safe_free(mycmd);
-
- return SWITCH_STATUS_SUCCESS;
- } else {
- skypiax_signaling_write(tech_pvt, (char *)&cmd[ strlen(argv[0]) + 1 ] );
- }
- } else {
- stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
- }
-end:
- switch_safe_free(mycmd);
+ char *mycmd = NULL, *argv[10] = { 0 };
+ int argc = 0;
+ private_t *tech_pvt = NULL;
- return SWITCH_STATUS_SUCCESS;
-}
+ if (!switch_strlen_zero(cmd) && (mycmd = strdup(cmd))) {
+ argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
+ }
+
+ if (!argc) {
+ stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
+ goto end;
+ }
+
+ if (argc < 2) {
+ stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
+ goto end;
+ }
+
+ if (argv[0]) {
+ int i;
+ int found = 0;
+
+ for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) {
+ /* we've been asked for a normal interface name, or we have not found idle interfaces to serve as the "ANY" interface */
+ if (strlen(globals.SKYPIAX_INTERFACES[i].name)
+ && (strncmp(globals.SKYPIAX_INTERFACES[i].name, argv[0], strlen(argv[0])) == 0)) {
+ tech_pvt = &globals.SKYPIAX_INTERFACES[i];
+ stream->write_function(stream,
+ "Using interface: globals.SKYPIAX_INTERFACES[%d].name=|||%s|||\n",
+ i, globals.SKYPIAX_INTERFACES[i].name);
+ found = 1;
+ break;
+ }
+ }
+ if (!found) {
+ stream->write_function(stream,
+ "ERROR: A Skypiax interface with name='%s' was not found\n",
+ argv[0]);
+ switch_safe_free(mycmd);
+ return SWITCH_STATUS_SUCCESS;
+ } else {
+ skypiax_signaling_write(tech_pvt, (char *) &cmd[strlen(argv[0]) + 1]);
+ }
+ } else {
+ stream->write_function(stream, "ERROR, usage: %s", SKYPIAX_SYNTAX);
+ }
+end:
+ switch_safe_free(mycmd);
+ return SWITCH_STATUS_SUCCESS;
+}
/* For Emacs:
* Local Variables:
Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (original)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c Sun Mar 29 04:21:07 2009
@@ -167,7 +167,8 @@
SKYPIAX_P_LOG, message, obj, id, prop, value, where ? where : "NULL");
if (!strcasecmp(prop, "PARTNER_HANDLE")) {
- skypiax_strncpy(tech_pvt->callid_number, value, sizeof(tech_pvt->callid_number) - 1);
+ skypiax_strncpy(tech_pvt->callid_number, value,
+ sizeof(tech_pvt->callid_number) - 1);
DEBUGA_SKYPE
("the skype_call %s caller PARTNER_HANDLE (tech_pvt->callid_number) is: %s\n",
SKYPIAX_P_LOG, id, tech_pvt->callid_number);
@@ -201,7 +202,8 @@
}
if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
if (strcasecmp(id, tech_pvt->skype_call_id)) {
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
DEBUGA_SKYPE
("We called a Skype contact and he answered us on skype_call: %s.\n",
SKYPIAX_P_LOG, id);
@@ -234,7 +236,8 @@
skypiax_signaling_write(tech_pvt, msg_to_skype);
DEBUGA_SKYPE("We answered a Skype RING on skype_call %s\n", SKYPIAX_P_LOG,
id);
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
} else {
/* we're owned, we're in a call, let's try to transfer */
/************************** TODO
@@ -251,7 +254,8 @@
DEBUGA_SKYPE
("Let's transfer the skype_call %s to %s interface (with skype_user: %s), because we are already in a skypiax call(%s)\n",
SKYPIAX_P_LOG, tech_pvt->skype_call_id,
- available_skypiax_interface->name, available_skypiax_interface->skype_user, id);
+ available_skypiax_interface->name,
+ available_skypiax_interface->skype_user, id);
sprintf(msg_to_skype, "ALTER CALL %s TRANSFER %s", id,
available_skypiax_interface->skype_user);
} else {
@@ -271,7 +275,8 @@
/* we are calling out */
tech_pvt->skype_callflow = CALLFLOW_STATUS_RINGING;
tech_pvt->interface_state = SKYPIAX_STATE_RINGING;
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
DEBUGA_SKYPE("Our remote party in skype_call %s is RINGING\n",
SKYPIAX_P_LOG, id);
remote_party_is_ringing(tech_pvt);
@@ -282,12 +287,12 @@
tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
NOTICA("Our remote party in skype_call %s is EARLYMEDIA\n", SKYPIAX_P_LOG,
id);
- start_audio_threads(tech_pvt);
- skypiax_sleep(1000);
+ start_audio_threads(tech_pvt);
+ skypiax_sleep(1000);
sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
tech_pvt->tcp_cli_port);
skypiax_signaling_write(tech_pvt, msg_to_skype);
- sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
+ sprintf(msg_to_skype, "#output ALTER CALL %s SET_OUTPUT PORT=\"%d\"", id,
tech_pvt->tcp_srv_port);
skypiax_signaling_write(tech_pvt, msg_to_skype);
@@ -328,7 +333,8 @@
("we tried to call Skype on skype_call %s and Skype has now FAILED\n",
SKYPIAX_P_LOG, id);
tech_pvt->skype_call_id[0] = '\0';
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
return CALLFLOW_INCOMING_HANGUP;
} else if (!strcasecmp(value, "REFUSED")) {
@@ -338,7 +344,8 @@
DEBUGA_SKYPE
("we tried to call Skype on skype_call %s and Skype has now REFUSED\n",
SKYPIAX_P_LOG, id);
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
tech_pvt->interface_state = SKYPIAX_STATE_DOWN;
tech_pvt->skype_call_id[0] = '\0';
return CALLFLOW_INCOMING_HANGUP;
@@ -347,31 +354,34 @@
DEBUGA_SKYPE("we REFUSED skype_call %s\n", SKYPIAX_P_LOG, id);
}
} else if (!strcasecmp(value, "TRANSFERRING")) {
- DEBUGA_SKYPE("skype_call %s is transferring\n", SKYPIAX_P_LOG, id);
+ DEBUGA_SKYPE("skype_call %s is transferring\n", SKYPIAX_P_LOG, id);
} else if (!strcasecmp(value, "TRANSFERRED")) {
- DEBUGA_SKYPE("skype_call %s has been transferred\n", SKYPIAX_P_LOG, id);
+ DEBUGA_SKYPE("skype_call %s has been transferred\n", SKYPIAX_P_LOG, id);
} else if (!strcasecmp(value, "ROUTING")) {
tech_pvt->skype_callflow = CALLFLOW_STATUS_ROUTING;
tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
DEBUGA_SKYPE("skype_call: %s is now ROUTING\n", SKYPIAX_P_LOG, id);
} else if (!strcasecmp(value, "UNPLACED")) {
tech_pvt->skype_callflow = CALLFLOW_STATUS_UNPLACED;
tech_pvt->interface_state = SKYPIAX_STATE_DIALING;
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
DEBUGA_SKYPE("skype_call: %s is now UNPLACED\n", SKYPIAX_P_LOG, id);
} else if (!strcasecmp(value, "INPROGRESS")) {
char msg_to_skype[1024];
if (!strlen(tech_pvt->session_uuid_str) || !strlen(tech_pvt->skype_call_id)
|| !strcasecmp(tech_pvt->skype_call_id, id)) {
- skypiax_strncpy(tech_pvt->skype_call_id, id, sizeof(tech_pvt->skype_call_id) - 1);
+ skypiax_strncpy(tech_pvt->skype_call_id, id,
+ sizeof(tech_pvt->skype_call_id) - 1);
DEBUGA_SKYPE("skype_call: %s is now active\n", SKYPIAX_P_LOG, id);
if (tech_pvt->skype_callflow != CALLFLOW_STATUS_EARLYMEDIA) {
tech_pvt->skype_callflow = CALLFLOW_STATUS_INPROGRESS;
tech_pvt->interface_state = SKYPIAX_STATE_UP;
start_audio_threads(tech_pvt);
- skypiax_sleep(1000);
+ skypiax_sleep(1000);
sprintf(msg_to_skype, "ALTER CALL %s SET_INPUT PORT=\"%d\"", id,
tech_pvt->tcp_cli_port);
skypiax_signaling_write(tech_pvt, msg_to_skype);
@@ -495,7 +505,7 @@
if (rt > 0) {
#ifdef FARMING
- switch_sleep(500); //seems that reconnecting through a proxy leads to half the packet size, bizarrely, 158-162, never 160 :-)
+ switch_sleep(500); //seems that reconnecting through a proxy leads to half the packet size, bizarrely, 158-162, never 160 :-)
#endif // FARMING
len = recv(fd, (char *) srv_in, 320, 0); //seems that Skype only sends 320 bytes at time
@@ -790,6 +800,7 @@
return howmany;
}
+
int skypiax_pipe_write(switch_file_t * pipe, short *buf, int howmany)
{
switch_size_t quantity;
@@ -802,6 +813,7 @@
return howmany;
}
+
int skypiax_close_socket(unsigned int fd)
{
int res;
@@ -828,11 +840,13 @@
howmany = read(pipe, buf, howmany);
return howmany;
}
+
int skypiax_pipe_write(int pipe, short *buf, int howmany)
{
howmany = write(pipe, buf, howmany);
return howmany;
}
+
int skypiax_close_socket(unsigned int fd)
{
int res;
@@ -966,7 +980,7 @@
memset(msg_from_skype, '\0', sizeof(msg_from_skype));
skypiax_strncpy(msg_from_skype, (const char *) poCopyData->lpData,
- sizeof(msg_from_skype) - 2);
+ sizeof(msg_from_skype) - 2);
howmany = strlen(msg_from_skype) + 1;
howmany =
@@ -995,8 +1009,8 @@
skypiax_sleep(5000);
if (!tech_pvt->SkypiaxHandles.currentuserhandle) {
SendMessage(HWND_BROADCAST,
- tech_pvt->SkypiaxHandles.
- win32_uiGlobal_MsgID_SkypeControlAPIDiscover,
+ tech_pvt->
+ SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover,
(WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle,
0);
}
@@ -1012,8 +1026,8 @@
skypiax_sleep(5000);
if (!tech_pvt->SkypiaxHandles.currentuserhandle) {
SendMessage(HWND_BROADCAST,
- tech_pvt->SkypiaxHandles.
- win32_uiGlobal_MsgID_SkypeControlAPIDiscover,
+ tech_pvt->
+ SkypiaxHandles.win32_uiGlobal_MsgID_SkypeControlAPIDiscover,
(WPARAM) tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle,
0);
}
@@ -1072,7 +1086,7 @@
}
if (fReturnStatus == 0)
CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
- tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
+ tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
return (fReturnStatus);
}
@@ -1081,7 +1095,7 @@
UnregisterClass(tech_pvt->SkypiaxHandles.win32_acInit_WindowClassName,
tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
CloseHandle(tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle);
- tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
+ tech_pvt->SkypiaxHandles.win32_hInit_ProcessHandle = NULL;
}
int win32_Initialize_CreateMainWindow(private_t * tech_pvt)
@@ -1183,11 +1197,11 @@
#ifdef FARMING
int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
{
- printf("%s\n", message_P);
- fflush(stdout);
+ printf("%s\n", message_P);
+ fflush(stdout);
return 1;
}
-#else// FARMING
+#else // FARMING
int skypiax_send_message(struct SkypiaxHandles *SkypiaxHandles, const char *message_P)
{
@@ -1236,7 +1250,7 @@
return 1;
}
-#endif// FARMING
+#endif // FARMING
int skypiax_signaling_write(private_t * tech_pvt, char *msg_to_skype)
{
struct SkypiaxHandles *SkypiaxHandles;
@@ -1336,23 +1350,22 @@
}
SkypiaxHandles = &tech_pvt->SkypiaxHandles;
-
SkypiaxHandles->api_connected = 1;
- char *b;
- unsigned int howmany;
+ char *b;
+ unsigned int howmany;
- while (1) {
- char s[17000];
+ while (1) {
+ char s[17000];
- memset(s, '\0', 17000);
- b=fgets(s, sizeof(s) - 1, stdin);
- s[strlen(s) - 1] = '\0';
- howmany = strlen(s) + 1;
+ memset(s, '\0', 17000);
+ b = fgets(s, sizeof(s) - 1, stdin);
+ s[strlen(s) - 1] = '\0';
+ howmany = strlen(s) + 1;
- howmany = write(SkypiaxHandles->fdesc[1], &s, howmany);
+ howmany = write(SkypiaxHandles->fdesc[1], &s, howmany);
- }
+ }
}
#else //FARMING
More information about the Freeswitch-svn
mailing list