dect/asterisk
Archived
14
0
Fork 0
Code Releases Activity

Merged revisions 75711 via svnmerge from

Browse source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #9245)
........
r75711 | qwell | 2007-07-18 14:54:32 -0500 (Wed, 18 Jul 2007) | 4 lines

Fixes for 7935/7936 conference phones.

Issue 9245, patch by slimey.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75714 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
qwell 2007-07-18 20:05:45 +00:00
parent 590fe6918a
commit 41ce098672
1 changed files with 81 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
channels/chan_skinny.c
View file

@ -170,6 +170,12 @@ struct keypad_button_message {
uint32_t callReference;
};
#define ENBLOC_CALL_MESSAGE 0x0004
struct enbloc_call_message {
char calledParty[24];
};
#define STIMULUS_MESSAGE 0x0005
struct stimulus_message {
uint32_t stimulus;
@ -553,6 +559,7 @@ struct soft_key_definitions {
static const uint8_t soft_key_default_onhook[] = {
SOFTKEY_REDIAL,
SOFTKEY_NEWCALL,
SOFTKEY_CFWDALL,
SOFTKEY_CFWDBUSY,
SOFTKEY_GPICKUP,
@ -746,6 +753,7 @@ union skinny_data {
struct display_notify_message displaynotify;
struct dialed_number_message dialednumber;
struct soft_key_event_message softkeyeventmessage;
struct enbloc_call_message enbloccallmessage;
};
/* packet composition */
@ -1797,16 +1805,27 @@ static void transmit_displaypromptstatus(struct skinnysession *s, const char *te
{
struct skinny_req *req;
if (!(req = req_alloc(sizeof(struct display_prompt_status_message), DISPLAY_PROMPT_STATUS_MESSAGE)))
return;
if (text == 0) {
if (!(req = req_alloc(sizeof(struct clear_prompt_message), CLEAR_PROMPT_MESSAGE)))
return;
ast_copy_string(req->data.displaypromptstatus.promptMessage, text, sizeof(req->data.displaypromptstatus.promptMessage));
req->data.displaypromptstatus.messageTimeout = htolel(t);
req->data.displaypromptstatus.lineInstance = htolel(instance);
req->data.displaypromptstatus.callReference = htolel(callid);
req->data.clearpromptstatus.lineInstance = htolel(instance);
req->data.clearpromptstatus.callReference = htolel(callid);
if (skinnydebug)
ast_verbose("Displaying Prompt Status '%s'\n", text);
if (skinnydebug)
ast_verbose("Clearing Prompt\n");
} else {
if (!(req = req_alloc(sizeof(struct display_prompt_status_message), DISPLAY_PROMPT_STATUS_MESSAGE)))
return;
ast_copy_string(req->data.displaypromptstatus.promptMessage, text, sizeof(req->data.displaypromptstatus.promptMessage));
req->data.displaypromptstatus.messageTimeout = htolel(t);
req->data.displaypromptstatus.lineInstance = htolel(instance);
req->data.displaypromptstatus.callReference = htolel(callid);
if (skinnydebug)
ast_verbose("Displaying Prompt Status '%s'\n", text);
}
transmit_response(s, req);
}
@ -4010,6 +4029,56 @@ static int handle_open_receive_channel_ack_message(struct skinny_req *req, struc
return 1;
}
static int handle_enbloc_call_message(struct skinny_req *req, struct skinnysession *s)
{
struct skinny_device *d = s->device;
struct skinny_line *l;
struct skinny_subchannel *sub = NULL;
struct ast_channel *c;
pthread_t t;
if (skinnydebug)
ast_verbose("Received Enbloc Call: %s\n", req->data.enbloccallmessage.calledParty);
sub = find_subchannel_by_instance_reference(d, d->lastlineinstance, d->lastcallreference);
if (!sub) {
l = find_line_by_instance(d, d->lastlineinstance);
if (!l) {
return 0;
}
} else {
l = sub->parent;
}
c = skinny_new(l, AST_STATE_DOWN);
if(!c) {
ast_log(LOG_WARNING, "Unable to create channel for %s@%s\n", l->name, d->name);
} else {
l->hookstate = SKINNY_OFFHOOK;
sub = c->tech_pvt;
transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid);
if (skinnydebug)
ast_verbose("Attempting to Clear display on Skinny %s@%s\n", l->name, d->name);
transmit_displaymessage(s, NULL); /* clear display */
transmit_tone(s, SKINNY_DIALTONE);
if (!ast_ignore_pattern(c->context, req->data.enbloccallmessage.calledParty)) {
transmit_tone(s, SKINNY_SILENCE);
}
ast_copy_string(c->exten, req->data.enbloccallmessage.calledParty, sizeof(c->exten));
if (ast_pthread_create(&t, NULL, skinny_newcall, c)) {
ast_log(LOG_WARNING, "Unable to create new call thread: %s\n", strerror(errno));
ast_hangup(c);
}
}
return 1;
}
static int handle_soft_key_set_req_message(struct skinny_req *req, struct skinnysession *s)
{
int i;
@ -4031,6 +4100,7 @@ static int handle_soft_key_set_req_message(struct skinny_req *req, struct skinny
for (i = 0; i < (sizeof(soft_key_template_default) / sizeof(struct soft_key_template_definition)); i++) {
if (defaults[y] == i+1) {
req->data.softkeysets.softKeySetDefinition[softkeymode->mode].softKeyTemplateIndex[y] = htolel(i+1);
req->data.softkeysets.softKeySetDefinition[softkeymode->mode].softKeyInfoIndex[y] = htolel(i+301);
}
}
}
@ -4421,6 +4491,9 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
res = handle_keypad_button_message(req, s);
}
break;
case ENBLOC_CALL_MESSAGE:
res = handle_enbloc_call_message(req, s);
break;
case STIMULUS_MESSAGE:
res = handle_stimulus_message(req, s);
break;