Index: channels/chan_skinny.c =================================================================== @@ -1862,7 +1864,7 @@ return; if (skinnydebug) - ast_debug(1, "Setting Callinfo to %s(%s) from %s(%s) on %s(%d)\n", fromname, fromnum, toname, tonum, s->device->name, instance); + ast_verb(1, "Setting Callinfo to %s(%s) from %s(%s) on %s(%d)\n", fromname, fromnum, toname, tonum, s->device->name, instance); if (fromname) { ast_copy_string(req->data.callinfo.callingPartyName, fromname, sizeof(req->data.callinfo.callingPartyName)); @@ -1962,7 +1964,7 @@ struct skinny_req *req; if (skinnydebug) - ast_debug(1, "Setting ringer mode to '%d'.\n", mode); + ast_verb(1, "Setting ringer mode to '%d'.\n", mode); if (!(req = req_alloc(sizeof(struct set_ringer_message), SET_RINGER_MESSAGE))) return; @@ -1994,14 +1996,14 @@ req->data.clearpromptstatus.callReference = reference; if (skinnydebug) - ast_debug(1, "Clearing Display\n"); + ast_verb(1, "Clearing Display\n"); } else { if (!(req = req_alloc(sizeof(struct displaytext_message), DISPLAYTEXT_MESSAGE))) return; ast_copy_string(req->data.displaytext.text, text, sizeof(req->data.displaytext.text)); if (skinnydebug) - ast_debug(1, "Displaying message '%s'\n", req->data.displaytext.text); + ast_verb(1, "Displaying message '%s'\n", req->data.displaytext.text); } transmit_response(s, req); @@ -2018,7 +2020,7 @@ req->data.displaynotify.displayTimeout = htolel(t); if (skinnydebug) - ast_debug(1, "Displaying notify '%s'\n", text); + ast_verb(1, "Displaying notify '%s'\n", text); transmit_response(s, req); } @@ -2035,7 +2037,7 @@ req->data.clearpromptstatus.callReference = htolel(callid); if (skinnydebug) - ast_debug(1, "Clearing Prompt\n"); + ast_verb(1, "Clearing Prompt\n"); } else { if (!(req = req_alloc(sizeof(struct display_prompt_status_message), DISPLAY_PROMPT_STATUS_MESSAGE))) return; @@ -2046,7 +2048,7 @@ req->data.displaypromptstatus.callReference = htolel(callid); if (skinnydebug) - ast_debug(1, "Displaying Prompt Status '%s'\n", text); + ast_verb(1, "Displaying Prompt Status '%s'\n", text); } transmit_response(s, req); @@ -2229,10 +2260,9 @@ for (l = d->lines; l; l = l->next) { if (has_voicemail(l)) { if (skinnydebug) - ast_debug(1, "Checking for voicemail Skinny %s@%s\n", l->name, d->name); - ast_app_inboxcount(l->mailbox, &new, &old); + ast_verb(1, "Checking for voicemail Skinny %s@%s\n", l->name, d->name); if (skinnydebug) - ast_debug(1, "Skinny %s@%s has voicemail!\n", l->name, d->name); + ast_verb(1, "Skinny %s@%s has voicemail!\n", l->name, d->name); transmit_lamp_indication(s, STIMULUS_VOICEMAIL, l->instance, l->mwiblink?SKINNY_LAMP_BLINK:SKINNY_LAMP_ON); device_lamp++; } else { @@ -2268,7 +2298,7 @@ enum ast_rtp_get_result res = AST_RTP_TRY_NATIVE; if (skinnydebug) - ast_debug(1, "skinny_get_rtp_peer() Channel = %s\n", c->name); + ast_verb(1, "skinny_get_rtp_peer() Channel = %s\n", c->name); if (!(sub = c->tech_pvt)) @@ -2288,7 +2318,7 @@ if (!l->canreinvite || l->nat){ res = AST_RTP_TRY_PARTIAL; if (skinnydebug) - ast_debug(1, "skinny_get_rtp_peer() Using AST_RTP_TRY_PARTIAL \n"); + ast_verb(1, "skinny_get_rtp_peer() Using AST_RTP_TRY_PARTIAL \n"); } ast_mutex_unlock(&sub->lock); @@ -2333,7 +2363,7 @@ transmit_response(s, req); if (skinnydebug) - ast_debug(1, "Peerip = %s:%d\n", ast_inet_ntoa(them.sin_addr), ntohs(them.sin_port)); + ast_verb(1, "Peerip = %s:%d\n", ast_inet_ntoa(them.sin_addr), ntohs(them.sin_port)); if (!(req = req_alloc(sizeof(struct start_media_transmission_message), START_MEDIA_TRANSMISSION_MESSAGE))) return -1; @@ -2341,7 +2371,7 @@ fmt = ast_codec_pref_getsize(&l->prefs, ast_best_codec(l->capability)); if (skinnydebug) - ast_debug(1, "Setting payloadType to '%d' (%d ms)\n", fmt.bits, fmt.cur_ms); + ast_verb(1, "Setting payloadType to '%d' (%d ms)\n", fmt.bits, fmt.cur_ms); req->data.startmedia.conferenceId = htolel(sub->callid); req->data.startmedia.passThruPartyId = htolel(sub->callid); @@ -3324,7 +3367,7 @@ d = l->parent; s = d->session; if (skinnydebug) - ast_debug(1, "skinny_hangup(%s) on %s@%s\n", ast->name, l->name, d->name); + ast_verb(1, "skinny_hangup(%s) on %s@%s\n", ast->name, l->name, d->name); if (d->registered) { if ((l->type = TYPE_LINE) && (l->hookstate == SKINNY_OFFHOOK)) { @@ -3369,7 +3412,7 @@ start_rtp(sub); } if (skinnydebug) - ast_debug(1, "skinny_answer(%s) on %s@%s-%d\n", ast->name, l->name, d->name, sub->callid); + ast_verb(1, "skinny_answer(%s) on %s@%s-%d\n", ast->name, l->name, d->name, sub->callid); if (ast->_state != AST_STATE_UP) { ast_setstate(ast, AST_STATE_UP); } @@ -3699,7 +3742,7 @@ tmp->nativeformats = default_capability; fmt = ast_best_codec(tmp->nativeformats); if (skinnydebug) - ast_debug(1, "skinny_new: tmp->nativeformats=%d fmt=%d\n", tmp->nativeformats, fmt); + ast_verb(1, "skinny_new: tmp->nativeformats=%d fmt=%d\n", tmp->nativeformats, fmt); if (sub->rtp) { ast_channel_set_fd(tmp, 0, ast_rtp_fd(sub->rtp)); } @@ -3771,7 +3814,7 @@ /* Channel needs to be put on hold */ if (skinnydebug) - ast_debug(1, "Putting on Hold(%d)\n", l->instance); + ast_verb(1, "Putting on Hold(%d)\n", l->instance); ast_queue_control_data(sub->owner, AST_CONTROL_HOLD, S_OR(l->mohsuggest, NULL), @@ -3815,7 +3858,7 @@ /* Channel is on hold, so we will unhold */ if (skinnydebug) - ast_debug(1, "Taking off Hold(%d)\n", l->instance); + ast_verb(1, "Taking off Hold(%d)\n", l->instance); ast_queue_control(sub->owner, AST_CONTROL_UNHOLD); @@ -3872,7 +3915,7 @@ req->data.regack.secondaryKeepAlive = htolel(keep_alive); transmit_response(s, req); if (skinnydebug) - ast_debug(1, "Requesting capabilities\n"); + ast_verb(1, "Requesting capabilities\n"); if (!(req = req_alloc(0, CAPABILITIES_REQ_MESSAGE))) return -1; @@ -3896,7 +3939,7 @@ transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ if (l->cfwdtype & cfwdtype) { @@ -3992,7 +4035,7 @@ } } else { if (skinnydebug) - ast_debug(1, "No owner: %s\n", l->name); + ast_verb(1, "No owner: %s\n", l->name); } return 1; } @@ -4014,7 +4057,7 @@ instance = letohl(req->data.stimulus.stimulusInstance); callreference = letohl(req->data.stimulus.callreference); if (skinnydebug) - ast_debug(1, "callreference in handle_stimulus_message is '%d'\n", callreference); + ast_verb(1, "callreference in handle_stimulus_message is '%d'\n", callreference); /* Note that this call should be using the passed in instance and callreference */ sub = find_subchannel_by_instance_reference(d, d->lastlineinstance, d->lastcallreference); @@ -4031,7 +4074,7 @@ switch(event) { case STIMULUS_REDIAL: if (skinnydebug) - ast_debug(1, "Received Stimulus: Redial(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Redial(%d/%d)\n", instance, callreference); if (ast_strlen_zero(l->lastnumberdialed)) { ast_log(LOG_WARNING, "Attempted redial, but no previously dialed number found.\n"); @@ -4052,7 +4095,7 @@ transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_RINGOUT); @@ -4072,7 +4115,7 @@ struct skinny_speeddial *sd; if (skinnydebug) - ast_debug(1, "Received Stimulus: SpeedDial(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: SpeedDial(%d/%d)\n", instance, callreference); if (!(sd = find_speeddial_by_instance(d, instance, 0))) { return 0; } @@ -4093,7 +4136,7 @@ transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_RINGOUT); @@ -4116,7 +4159,7 @@ break; case STIMULUS_HOLD: if (skinnydebug) - ast_debug(1, "Received Stimulus: Hold(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Hold(%d/%d)\n", instance, callreference); if (!sub) break; @@ -4129,17 +4172,17 @@ break; case STIMULUS_TRANSFER: if (skinnydebug) - ast_debug(1, "Received Stimulus: Transfer(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Transfer(%d/%d)\n", instance, callreference); /* XXX figure out how to transfer */ break; case STIMULUS_CONFERENCE: if (skinnydebug) - ast_debug(1, "Received Stimulus: Conference(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Conference(%d/%d)\n", instance, callreference); /* XXX determine the best way to pull off a conference. Meetme? */ break; case STIMULUS_VOICEMAIL: if (skinnydebug) - ast_debug(1, "Received Stimulus: Voicemail(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Voicemail(%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -4162,7 +4205,7 @@ } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); @@ -4185,12 +4228,12 @@ break; case STIMULUS_CALLPARK: if (skinnydebug) - ast_debug(1, "Received Stimulus: Park Call(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Park Call(%d/%d)\n", instance, callreference); /* XXX Park the call */ break; case STIMULUS_DND: if (skinnydebug) - ast_debug(1, "Received Stimulus: DND (%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: DND (%d/%d)\n", instance, callreference); /* Do not disturb */ if (l->dnd != 0){ @@ -4207,7 +4250,7 @@ break; case STIMULUS_FORWARDALL: if (skinnydebug) - ast_debug(1, "Received Stimulus: Forward All(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Forward All(%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -4224,7 +4267,7 @@ break; case STIMULUS_FORWARDBUSY: if (skinnydebug) - ast_debug(1, "Received Stimulus: Forward Busy (%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Forward Busy (%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -4241,7 +4284,7 @@ break; case STIMULUS_FORWARDNOANSWER: if (skinnydebug) - ast_debug(1, "Received Stimulus: Forward No Answer (%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Forward No Answer (%d/%d)\n", instance, callreference); #if 0 /* Not sure how to handle this yet */ if (!sub || !sub->owner) { @@ -4261,11 +4304,11 @@ case STIMULUS_DISPLAY: /* Not sure what this is */ if (skinnydebug) - ast_debug(1, "Received Stimulus: Display(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Display(%d/%d)\n", instance, callreference); break; case STIMULUS_LINE: if (skinnydebug) - ast_debug(1, "Received Stimulus: Line(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Stimulus: Line(%d/%d)\n", instance, callreference); l = find_line_by_instance(d, instance); @@ -4301,7 +4344,7 @@ sub = c->tech_pvt; transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_OFFHOOK); @@ -4319,7 +4362,7 @@ break; default: if (skinnydebug) - ast_debug(1, "RECEIVED UNKNOWN STIMULUS: %d(%d/%d)\n", event, instance, callreference); + ast_verb(1, "RECEIVED UNKNOWN STIMULUS: %d(%d/%d)\n", event, instance, callreference); break; } ast_device_state_changed("Skinny/%s@%s", l->name, d->name); @@ -4380,7 +4423,7 @@ sub = c->tech_pvt; transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_OFFHOOK); @@ -4431,7 +4474,7 @@ sub->cxmode = SKINNY_CX_RECVONLY; transmit_callstate(s, l->instance, l->hookstate, sub->callid); if (skinnydebug) - ast_debug(1, "Skinny %s@%s went on hook\n", l->name, d->name); + ast_verb(1, "Skinny %s@%s went on hook\n", l->name, d->name); if (l->transfer && (sub->owner && sub->next && sub->next->owner) && ((!sub->outgoing) || (sub->next && !sub->next->outgoing))) { /* We're allowed to transfer, we have two active calls and we made at least one of the calls. Let's try and transfer */ @@ -4484,7 +4527,7 @@ scodec = letohl(req->data.caps.caps[i].codec); acodec = codec_skinny2ast(scodec); if (skinnydebug) - ast_debug(1, "Adding codec capability '%d (%d)'\n", acodec, scodec); + ast_verb(1, "Adding codec capability '%d (%d)'\n", acodec, scodec); codecs |= acodec; } @@ -4725,7 +4768,7 @@ req->data.buttontemplate.totalButtonCount = htolel(buttonCount); if (skinnydebug) - ast_debug(1, "Sending %d template to %s\n", + ast_verb(1, "Sending %d template to %s\n", d->type, d->name); transmit_response(s, req); @@ -4761,7 +4804,7 @@ { /* no response necessary */ if (skinnydebug) - ast_debug(1, "Received Alarm Message: %s\n", req->data.alarm.displayMessage); + ast_verb(1, "Received Alarm Message: %s\n", req->data.alarm.displayMessage); return 1; } @@ -4808,7 +4851,7 @@ } if (skinnydebug) - ast_debug(1, "ipaddr = %s:%d\n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); + ast_verb(1, "ipaddr = %s:%d\n", ast_inet_ntoa(sin.sin_addr), ntohs(sin.sin_port)); if (!(req = req_alloc(sizeof(struct start_media_transmission_message), START_MEDIA_TRANSMISSION_MESSAGE))) return -1; @@ -4816,7 +4859,7 @@ fmt = ast_codec_pref_getsize(&l->prefs, ast_best_codec(l->capability)); if (skinnydebug) - ast_debug(1, "Setting payloadType to '%d' (%d ms)\n", fmt.bits, fmt.cur_ms); + ast_verb(1, "Setting payloadType to '%d' (%d ms)\n", fmt.bits, fmt.cur_ms); req->data.startmedia.conferenceId = htolel(sub->callid); req->data.startmedia.passThruPartyId = htolel(sub->callid); @@ -4842,7 +4885,7 @@ pthread_t t; if (skinnydebug) - ast_debug(1, "Received Enbloc Call: %s\n", req->data.enbloccallmessage.calledParty); + ast_verb(1, "Received Enbloc Call: %s\n", req->data.enbloccallmessage.calledParty); sub = find_subchannel_by_instance_reference(d, d->lastlineinstance, d->lastcallreference); @@ -4865,7 +4908,7 @@ sub = c->tech_pvt; transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); @@ -4943,7 +4986,7 @@ if (!l) { if (skinnydebug) - ast_debug(1, "Received Softkey Event: %d(%d/%d)\n", event, instance, callreference); + ast_verb(1, "Received Softkey Event: %d(%d/%d)\n", event, instance, callreference); return 0; } @@ -4952,11 +4995,11 @@ switch(event) { case SOFTKEY_NONE: if (skinnydebug) - ast_debug(1, "Received Softkey Event: None(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: None(%d/%d)\n", instance, callreference); break; case SOFTKEY_REDIAL: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Redial(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Redial(%d/%d)\n", instance, callreference); if (ast_strlen_zero(l->lastnumberdialed)) { ast_log(LOG_WARNING, "Attempted redial, but no previously dialed number found.\n"); @@ -4982,7 +5025,7 @@ transmit_callstate(s, l->instance, SKINNY_OFFHOOK, sub->callid); } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_RINGOUT); @@ -4999,7 +5042,7 @@ break; case SOFTKEY_NEWCALL: /* Actually the DIAL softkey */ if (skinnydebug) - ast_debug(1, "Received Softkey Event: New Call(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: New Call(%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -5023,7 +5066,7 @@ } if (skinnydebug) - ast_debug(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); + ast_verb(1, "Attempting to Clear display on Skinny %s@%s\n", l->name, d->name); transmit_displaymessage(s, NULL, l->instance, sub->callid); /* clear display */ transmit_tone(s, SKINNY_DIALTONE, l->instance, sub->callid); transmit_selectsoftkeys(s, l->instance, sub->callid, KEYDEF_OFFHOOK); @@ -5037,7 +5080,7 @@ break; case SOFTKEY_HOLD: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Hold(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Hold(%d/%d)\n", instance, callreference); if (sub) { if (sub->onhold) { @@ -5050,12 +5093,12 @@ break; case SOFTKEY_TRNSFER: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Transfer(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Transfer(%d/%d)\n", instance, callreference); /* XXX figure out how to transfer */ break; case SOFTKEY_DND: if (skinnydebug) - ast_debug(1, "Received Softkey Event: DND(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: DND(%d/%d)\n", instance, callreference); /* Do not disturb */ if (l->dnd != 0){ @@ -5072,7 +5115,7 @@ break; case SOFTKEY_CFWDALL: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Forward All(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Forward All(%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -5089,7 +5132,7 @@ break; case SOFTKEY_CFWDBUSY: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Forward Busy (%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Forward Busy (%d/%d)\n", instance, callreference); if (!sub || !sub->owner) { c = skinny_new(l, AST_STATE_DOWN); @@ -5106,7 +5149,7 @@ break; case SOFTKEY_CFWDNOANSWER: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Forward No Answer (%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Forward No Answer (%d/%d)\n", instance, callreference); #if 0 /* Not sure how to handle this yet */ if (!sub || !sub->owner) { @@ -5125,11 +5168,11 @@ break; case SOFTKEY_BKSPC: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Backspace(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Backspace(%d/%d)\n", instance, callreference); break; case SOFTKEY_ENDCALL: if (skinnydebug) - ast_debug(1, "Received Softkey Event: End Call(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: End Call(%d/%d)\n", instance, callreference); if (l->hookstate == SKINNY_ONHOOK) { /* Something else already put us back on hook */ @@ -5140,7 +5183,7 @@ l->hookstate = SKINNY_ONHOOK; transmit_callstate(s, l->instance, l->hookstate, sub->callid); if (skinnydebug) - ast_debug(1, "Skinny %s@%s went on hook\n", l->name, d->name); + ast_verb(1, "Skinny %s@%s went on hook\n", l->name, d->name); if (l->transfer && (sub->owner && sub->next && sub->next->owner) && ((!sub->outgoing) || (sub->next && !sub->next->outgoing))) { /* We're allowed to transfer, we have two active calls and we made at least one of the calls. Let's try and transfer */ @@ -5174,11 +5217,11 @@ break; case SOFTKEY_RESUME: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Resume(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Resume(%d/%d)\n", instance, callreference); break; case SOFTKEY_ANSWER: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Answer(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Answer(%d/%d)\n", instance, callreference); transmit_ringer_mode(s,SKINNY_RING_OFF); transmit_lamp_indication(s, STIMULUS_LINE, l->instance, SKINNY_LAMP_ON); @@ -5198,38 +5241,38 @@ break; case SOFTKEY_INFO: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Info(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Info(%d/%d)\n", instance, callreference); break; case SOFTKEY_CONFRN: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Conference(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Conference(%d/%d)\n", instance, callreference); /* XXX determine the best way to pull off a conference. Meetme? */ break; case SOFTKEY_PARK: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Park Call(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Park Call(%d/%d)\n", instance, callreference); /* XXX Park the call */ break; case SOFTKEY_JOIN: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Join(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Join(%d/%d)\n", instance, callreference); break; case SOFTKEY_MEETME: /* XXX How is this different from CONFRN? */ if (skinnydebug) - ast_debug(1, "Received Softkey Event: Meetme(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Meetme(%d/%d)\n", instance, callreference); break; case SOFTKEY_PICKUP: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Pickup(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Pickup(%d/%d)\n", instance, callreference); break; case SOFTKEY_GPICKUP: if (skinnydebug) - ast_debug(1, "Received Softkey Event: Group Pickup(%d/%d)\n", instance, callreference); + ast_verb(1, "Received Softkey Event: Group Pickup(%d/%d)\n", instance, callreference); break; default: if (skinnydebug) - ast_debug(1, "Received unknown Softkey Event: %d(%d/%d)\n", event, instance, callreference); + ast_verb(1, "Received unknown Softkey Event: %d(%d/%d)\n", event, instance, callreference); break; } ast_device_state_changed("Skinny/%s@%s", l->name, d->name); @@ -5285,7 +5328,7 @@ break; case REGISTER_MESSAGE: if (skinnydebug) - ast_debug(1, "Device %s is attempting to register\n", req->data.reg.name); + ast_verb(1, "Device %s is attempting to register\n", req->data.reg.name); res = handle_register_message(req, s); break; @@ -5300,7 +5343,7 @@ int callReference; if (skinnydebug) - ast_debug(1, "Collected digit: [%d]\n", letohl(req->data.keypad.button)); + ast_verb(1, "Collected digit: [%d]\n", letohl(req->data.keypad.button)); lineInstance = letohl(req->data.keypad.lineInstance); callReference = letohl(req->data.keypad.callReference); @@ -5349,42 +5392,42 @@ break; case CAPABILITIES_RES_MESSAGE: if (skinnydebug) - ast_debug(1, "Received CapabilitiesRes\n"); + ast_verb(1, "Received CapabilitiesRes\n"); res = handle_capabilities_res_message(req, s); break; case SPEED_DIAL_STAT_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Received SpeedDialStatRequest\n"); + ast_verb(1, "Received SpeedDialStatRequest\n"); res = handle_speed_dial_stat_req_message(req, s); break; case LINE_STATE_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Received LineStatRequest\n"); + ast_verb(1, "Received LineStatRequest\n"); res = handle_line_state_req_message(req, s); break; case TIME_DATE_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Received Time/Date Request\n"); + ast_verb(1, "Received Time/Date Request\n"); res = handle_time_date_req_message(req, s); break; case BUTTON_TEMPLATE_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Buttontemplate requested\n"); + ast_verb(1, "Buttontemplate requested\n"); res = handle_button_template_req_message(req, s); break; case VERSION_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Version Request\n"); + ast_verb(1, "Version Request\n"); res = handle_version_req_message(req, s); break; case SERVER_REQUEST_MESSAGE: if (skinnydebug) - ast_debug(1, "Received Server Request\n"); + ast_verb(1, "Received Server Request\n"); res = handle_server_request_message(req, s); break; @@ -5393,13 +5436,13 @@ break; case OPEN_RECEIVE_CHANNEL_ACK_MESSAGE: if (skinnydebug) - ast_debug(1, "Received Open Receive Channel Ack\n"); + ast_verb(1, "Received Open Receive Channel Ack\n"); res = handle_open_receive_channel_ack_message(req, s); break; case SOFT_KEY_SET_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Received SoftKeySetReq\n"); + ast_verb(1, "Received SoftKeySetReq\n"); res = handle_soft_key_set_req_message(req, s); break; @@ -5408,13 +5451,13 @@ break; case UNREGISTER_MESSAGE: if (skinnydebug) - ast_debug(1, "Received Unregister Request\n"); + ast_verb(1, "Received Unregister Request\n"); res = handle_unregister_message(req, s); break; case SOFT_KEY_TEMPLATE_REQ_MESSAGE: if (skinnydebug) - ast_debug(1, "Received SoftKey Template Request\n"); + ast_verb(1, "Received SoftKey Template Request\n"); res = handle_soft_key_template_req_message(req, s); break; @@ -5426,7 +5469,7 @@ break; default: if (skinnydebug) - ast_debug(1, "RECEIVED UNKNOWN MESSAGE TYPE: %x\n", letohl(req->e)); + ast_verb(1, "RECEIVED UNKNOWN MESSAGE TYPE: %x\n", letohl(req->e)); break; } if (res >= 0 && req) @@ -5482,7 +5525,7 @@ } } else if (res == 0) { if (skinnydebug) - ast_debug(1, "Skinny Client was lost, unregistering\n"); + ast_verb(1, "Skinny Client was lost, unregistering\n"); skinny_unregister(NULL, s); return -1; } @@ -5495,7 +5538,7 @@ ast_log(LOG_WARNING, "read() returned error: %s\n", strerror(errno)); if (skinnydebug) - ast_debug(1, "Skinny Client was lost, unregistering\n"); + ast_verb(1, "Skinny Client was lost, unregistering\n"); skinny_unregister(NULL,s); ast_mutex_unlock(&s->lock); @@ -5506,7 +5549,7 @@ if (res == 0) { if (skinnydebug) - ast_debug(1, "Skinny Client was lost, unregistering\n"); + ast_verb(1, "Skinny Client was lost, unregistering\n"); skinny_unregister(NULL, s); } @@ -5635,7 +5678,7 @@ } } if (skinnydebug) - ast_debug(1, "killing accept thread\n"); + ast_verb(1, "killing accept thread\n"); close(as); return 0; }