diff --git a/q931.c b/q931.c index a154090..bab8794 100755 --- a/q931.c +++ b/q931.c @@ -360,8 +360,6 @@ static int receive_channel_id(struct pri *pri, q931_call *call, int msgtype, q93 static int transmit_channel_id(struct pri *pri, q931_call *call, int msgtype, q931_ie *ie, int len) { int pos=0; - if (!call->channelno) - return 0; /* Start with standard stuff */ ie->data[pos] = 0xa1; /* Add exclusive flag if necessary */ @@ -1569,16 +1567,15 @@ static int restart_ack(struct pri *pri, q931_call *c) } #ifdef ALERTING_NO_PROGRESS -static int call_progress_ies[] = { Q931_CHANNEL_IDENT, -1 }; +static int call_progress_ies[] = { -1 }; #else -static int call_progress_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 }; +static int call_progress_ies[] = { Q931_PROGRESS_INDICATOR, -1 }; #endif int q931_call_progress(struct pri *pri, q931_call *c, int channel, int info) { if (!c->proc) q931_call_proceeding(pri, c, channel, 0); - c->channelno = 0; c->ourcallstate = Q931_CALL_STATE_INCOMING_CALL_PROCEEDING; c->peercallstate = Q931_CALL_STATE_OUTGOING_CALL_PROCEEDING; if (info) { @@ -1617,9 +1614,9 @@ int q931_call_proceeding(struct pri *pri, q931_call *c, int channel, int info) return send_message(pri, c, Q931_CALL_PROCEEDING, call_proceeding_ies); } #ifndef ALERTING_NO_PROGRESS -static int alerting_ies[] = { Q931_CHANNEL_IDENT, Q931_PROGRESS_INDICATOR, -1 }; +static int alerting_ies[] = { Q931_PROGRESS_INDICATOR, -1 }; #else -static int alerting_ies[] = { Q931_CHANNEL_IDENT, -1 }; +static int alerting_ies[] = { -1 }; #endif int q931_alerting(struct pri *pri, q931_call *c, int channel, int info)