From: Damien Wedhorn Date: Wed, 18 Aug 2010 21:34:27 +0000 (+0000) Subject: Cleanup: consolidate offhook (new call). X-Git-Tag: 11.0.0-beta1~2446 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e5b6069f44b7120ae41523b862fa0023099714b;p=thirdparty%2Fasterisk.git Cleanup: consolidate offhook (new call). Consolidates all offhook (new call with dialtone) to setsubstate_offhook. This should be roughly equivalent to existing code, although a couple of calls now run through the full offhook sequence rather than an abbreviated one. (closes issue #17812) Reported by: wedhorn Patches: cleanup.stateoffhook.diff uploaded by wedhorn (license 30) Tested by: salecha, wedhorn Review: NA git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282701 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index fc91138e52..049c634232 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -4677,6 +4677,31 @@ static struct ast_channel *skinny_new(struct skinny_line *l, int state, const ch return tmp; } +static void setsubstate_offhook(struct skinny_subchannel *sub) +{ + struct skinny_line *l = sub->parent; + struct skinny_device *d = l->device; + pthread_t t; + + ast_verb(1, "Call-id: %d\n", sub->callid); + l->activesub = sub; + if (l->hookstate == SKINNY_ONHOOK) { + l->hookstate = SKINNY_OFFHOOK; + transmit_speaker_mode(d, SKINNY_SPEAKERON); + } + transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK); + transmit_activatecallplane(d, l); + transmit_clear_display_message(d, l->instance, sub->callid); + transmit_start_tone(d, SKINNY_DIALTONE, l->instance, sub->callid); + transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_OFFHOOK); + + /* start the switch thread */ + if (ast_pthread_create(&t, NULL, skinny_ss, sub->owner)) { + ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); + ast_hangup(sub->owner); + } +} + static void setsubstate_connected(struct skinny_subchannel *sub) { struct skinny_line *l = sub->parent; @@ -4772,7 +4797,6 @@ static int handle_transfer_button(struct skinny_subchannel *sub) struct skinny_device *d; struct skinny_subchannel *newsub; struct ast_channel *c; - pthread_t t; if (!sub) { ast_verbose("Transfer: No subchannel to transfer\n"); @@ -4794,17 +4818,7 @@ static int handle_transfer_button(struct skinny_subchannel *sub) newsub->related = sub; sub->related = newsub; newsub->xferor = 1; - l->activesub = newsub; - transmit_callstate(d, l->instance, newsub->callid, SKINNY_OFFHOOK); - transmit_activatecallplane(d, l); - transmit_clear_display_message(d, l->instance, newsub->callid); - transmit_start_tone(d, SKINNY_DIALTONE, l->instance, newsub->callid); - transmit_selectsoftkeys(d, l->instance, newsub->callid, KEYDEF_OFFHOOKWITHFEAT); - /* start the switch thread */ - if (ast_pthread_create(&t, NULL, skinny_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } + setsubstate_offhook(newsub); } else { ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", l->name, d->name); } @@ -4835,7 +4849,6 @@ static int handle_callforward_button(struct skinny_subchannel *sub, int cfwdtype struct skinny_line *l = sub->parent; struct skinny_device *d = l->device; struct ast_channel *c = sub->owner; - pthread_t t; if (l->hookstate == SKINNY_ONHOOK) { l->hookstate = SKINNY_OFFHOOK; @@ -4864,12 +4877,7 @@ static int handle_callforward_button(struct skinny_subchannel *sub, int cfwdtype transmit_cfwdstate(d, l); } else { l->getforward = cfwdtype; - transmit_start_tone(d, SKINNY_DIALTONE, l->instance, sub->callid); - transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_RINGOUT); - if (ast_pthread_create(&t, NULL, skinny_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } + setsubstate_offhook(sub); } return 0; } @@ -5261,19 +5269,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession } else { c = skinny_new(l, AST_STATE_DOWN, NULL); if (c) { - sub = c->tech_pvt; - l->activesub = sub; - transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK); - transmit_activatecallplane(d, l); - transmit_clear_display_message(d, l->instance, sub->callid); - transmit_start_tone(d, SKINNY_DIALTONE, l->instance, sub->callid); - transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_OFFHOOK); - - /* start the switch thread */ - if (ast_pthread_create(&t, NULL, skinny_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } + setsubstate_offhook(c->tech_pvt); } else { ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", l->name, d->name); } @@ -5297,7 +5293,6 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession * struct skinny_subchannel *sub; struct ast_channel *c; struct skinny_line *tmp; - pthread_t t; int instance; int reference; @@ -5355,19 +5350,7 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession * } else { c = skinny_new(l, AST_STATE_DOWN, NULL); if (c) { - sub = c->tech_pvt; - l->activesub = sub; - transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK); - transmit_activatecallplane(d, l); - transmit_clear_display_message(d, l->instance, sub->callid); - transmit_start_tone(d, SKINNY_DIALTONE, l->instance, sub->callid); - transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_OFFHOOK); - - /* start the switch thread */ - if (ast_pthread_create(&t, NULL, skinny_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } + setsubstate_offhook(c->tech_pvt); } else { ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", l->name, d->name); } @@ -5848,34 +5831,10 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse c = skinny_new(l, AST_STATE_DOWN, NULL); sub = c->tech_pvt; - /* transmit_ringer_mode(d, SKINNY_RING_OFF); - transmit_lamp_indication(d, STIMULUS_LINE, l->instance, SKINNY_LAMP_ON); */ - - /* l->hookstate = SKINNY_OFFHOOK; */ - if (!c) { ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", l->name, d->name); } else { - sub = c->tech_pvt; - l->activesub = sub; - if (l->hookstate == SKINNY_ONHOOK) { - l->hookstate = SKINNY_OFFHOOK; - transmit_speaker_mode(d, SKINNY_SPEAKERON); - } - ast_verb(1, "Call-id: %d\n", sub->callid); - - transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK); - transmit_activatecallplane(d, l); - - transmit_clear_display_message(d, l->instance, sub->callid); - transmit_start_tone(d, SKINNY_DIALTONE, l->instance, sub->callid); - transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_OFFHOOK); - - /* start the switch thread */ - if (ast_pthread_create(&t, NULL, skinny_ss, c)) { - ast_log(LOG_WARNING, "Unable to create switch thread: %s\n", strerror(errno)); - ast_hangup(c); - } + setsubstate_offhook(sub); } break; case SOFTKEY_HOLD: