kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes display issues on 7910 and older phones.

Browse Source 
Also correct the callinfo provided in skinny_answer.

(closes issue #17876)
Reported by: salecha
Patches:
      skinny_cnd3.diff uploaded by wedhorn (license 30)
Tested by: salecha, wedhorn

Review: NA 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Damien Wedhorn
2010-08-23 20:23:51 +00:00
parent bf7465be6d
commit 101673347f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_skinny.c
View File

@@ -4164,9 +4164,11 @@ static int skinny_answer(struct ast_channel *ast)
for some reason, transmit_callinfo must be before transmit_callstate, for some reason, transmit_callinfo must be before transmit_callstate,
or you won't get keypad messages in some situations. */ or you won't get keypad messages in some situations. */
transmit_callinfo(d, transmit_callinfo(d,
S_COR(ast->connected.id.name.valid, ast->connected.id.name.str, ""), S_COR(ast->caller.id.name.valid, ast->caller.id.name.str, ""),
S_COR(ast->connected.id.number.valid, ast->connected.id.number.str, ""), S_COR(ast->caller.id.number.valid, ast->caller.id.number.str, ""),
l->lastnumberdialed, l->lastnumberdialed, l->instance, sub->callid, 2); l->lastnumberdialed,
l->lastnumberdialed,
l->instance, sub->callid, 2);
transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_CONNECTED); transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_CONNECTED);
transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_CONNECTED); transmit_selectsoftkeys(d, l->instance, sub->callid, KEYDEF_CONNECTED);
transmit_dialednumber(d, l->lastnumberdialed, l->instance, sub->callid); transmit_dialednumber(d, l->lastnumberdialed, l->instance, sub->callid);
@@ -4707,7 +4709,6 @@ static void setsubstate_connected(struct skinny_subchannel *sub)
struct skinny_line *l = sub->parent; struct skinny_line *l = sub->parent;
struct skinny_device *d = l->device; struct skinny_device *d = l->device;
transmit_callstate(d, l->instance, sub->callid, SKINNY_OFFHOOK);
transmit_activatecallplane(d, l); transmit_activatecallplane(d, l);
transmit_stop_tone(d, l->instance, sub->callid); transmit_stop_tone(d, l->instance, sub->callid);
transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_CONNECTED); transmit_callstate(d, sub->parent->instance, sub->callid, SKINNY_CONNECTED);
@@ -5327,9 +5328,6 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession *
sub = l->activesub; sub = l->activesub;
} }
/* Not ideal, but let's send updated time at onhook and offhook, as it clears the display */
transmit_definetimedate(d);
transmit_ringer_mode(d, SKINNY_RING_OFF); transmit_ringer_mode(d, SKINNY_RING_OFF);
l->hookstate = SKINNY_OFFHOOK; l->hookstate = SKINNY_OFFHOOK;
@@ -5345,6 +5343,9 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession *
/* We're answering a ringing call */ /* We're answering a ringing call */
setsubstate_connected(sub); setsubstate_connected(sub);
} else { } else {
/* Not ideal, but let's send updated time at onhook and offhook, as it clears the display */
transmit_definetimedate(d);
if (sub && sub->owner) { if (sub && sub->owner) {
ast_debug(1, "Current sub [%s] already has owner\n", sub->owner->name); ast_debug(1, "Current sub [%s] already has owner\n", sub->owner->name);
} else { } else {
@@ -5387,6 +5388,8 @@ static int handle_onhook_message(struct skinny_req *req, struct skinnysession *s
if (l->hookstate == SKINNY_ONHOOK) { if (l->hookstate == SKINNY_ONHOOK) {
/* Something else already put us back on hook */ /* Something else already put us back on hook */
/* Not ideal, but let's send updated time anyway, as it clears the display */
transmit_definetimedate(d);
return 0; return 0;
} }