Move all messages wrapped in skinnydebug from debug to verbose.
authorJason Parker <jparker@digium.com>
Wed, 9 Apr 2008 17:41:09 +0000 (17:41 +0000)
committerJason Parker <jparker@digium.com>
Wed, 9 Apr 2008 17:41:09 +0000 (17:41 +0000)
(closes issue #12224)
Reported by: DEA
Patches:
      chan_skinny-debug-log.txt uploaded by DEA (license 3)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113834 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_skinny.c

index 620ff46..6e4355a 100644 (file)
@@ -1889,7 +1889,7 @@ static void transmit_callinfo(struct skinnysession *s, const char *fromname, con
                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));
@@ -1989,7 +1989,7 @@ static void transmit_ringer_mode(struct skinnysession *s, int mode)
        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;
@@ -2021,14 +2021,14 @@ static void transmit_displaymessage(struct skinnysession *s, const char *text, i
                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);
@@ -2045,7 +2045,7 @@ static void transmit_displaynotify(struct skinnysession *s, const char *text, in
        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);
 }
@@ -2062,7 +2062,7 @@ static void transmit_displaypromptstatus(struct skinnysession *s, const char *te
                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;
@@ -2073,7 +2073,7 @@ static void transmit_displaypromptstatus(struct skinnysession *s, const char *te
                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);
@@ -2256,10 +2256,10 @@ static void do_housekeeping(struct skinnysession *s)
        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_verb(1, "Checking for voicemail Skinny %s@%s\n", l->name, d->name);
                        ast_app_inboxcount(l->mailbox, &new, &old);
                        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 {
@@ -2295,7 +2295,7 @@ static enum ast_rtp_get_result skinny_get_rtp_peer(struct ast_channel *c, struct
        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))
@@ -2315,7 +2315,7 @@ static enum ast_rtp_get_result skinny_get_rtp_peer(struct ast_channel *c, struct
        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);
@@ -2360,7 +2360,7 @@ static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp *rtp, struc
                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;
@@ -2368,7 +2368,7 @@ static int skinny_set_rtp_peer(struct ast_channel *c, struct ast_rtp *rtp, struc
                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);
@@ -3375,7 +3375,7 @@ static int skinny_hangup(struct ast_channel *ast)
        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)) {
@@ -3420,7 +3420,7 @@ static int skinny_answer(struct ast_channel *ast)
                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);
        }
@@ -3767,7 +3767,7 @@ static struct ast_channel *skinny_new(struct skinny_line *l, int state)
                        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));
                }
@@ -3839,7 +3839,7 @@ static int skinny_hold(struct skinny_subchannel *sub)
 
        /* 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),
@@ -3883,7 +3883,7 @@ static int skinny_unhold(struct skinny_subchannel *sub)
 
        /* 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);
 
@@ -3940,7 +3940,7 @@ static int handle_register_message(struct skinny_req *req, struct skinnysession
        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;
@@ -3964,7 +3964,7 @@ static int handle_callforward_button(struct skinny_subchannel *sub, int cfwdtype
                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) {
@@ -4060,7 +4060,7 @@ static int handle_keypad_button_message(struct skinny_req *req, struct skinnyses
                }
        } else {
                if (skinnydebug)
-                       ast_debug(1, "No owner: %s\n", l->name);
+                       ast_verb(1, "No owner: %s\n", l->name);
        }
        return 1;
 }
@@ -4082,7 +4082,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
        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);
@@ -4099,7 +4099,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
        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");
@@ -4120,7 +4120,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                                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);
@@ -4140,7 +4140,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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;
                }
@@ -4161,7 +4161,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                                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);
@@ -4184,7 +4184,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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;
@@ -4197,17 +4197,17 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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);
@@ -4230,7 +4230,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                        }
 
                        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);
@@ -4253,12 +4253,12 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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){
@@ -4275,7 +4275,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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);
@@ -4292,7 +4292,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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);
@@ -4309,7 +4309,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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) {
@@ -4329,11 +4329,11 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
        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);
 
@@ -4369,7 +4369,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                                        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);
@@ -4387,7 +4387,7 @@ static int handle_stimulus_message(struct skinny_req *req, struct skinnysession
                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);
@@ -4448,7 +4448,7 @@ static int handle_offhook_message(struct skinny_req *req, struct skinnysession *
                                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);
@@ -4499,7 +4499,7 @@ static int handle_onhook_message(struct skinny_req *req, struct skinnysession *s
        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 */
@@ -4552,7 +4552,7 @@ static int handle_capabilities_res_message(struct skinny_req *req, struct skinny
                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;
        }
 
@@ -4793,7 +4793,7 @@ static int handle_button_template_req_message(struct skinny_req *req, struct ski
        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);
@@ -4829,7 +4829,7 @@ static int handle_alarm_message(struct skinny_req *req, struct skinnysession *s)
 {
        /* 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;
 }
@@ -4876,7 +4876,7 @@ static int handle_open_receive_channel_ack_message(struct skinny_req *req, struc
        }
 
        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;
@@ -4884,7 +4884,7 @@ static int handle_open_receive_channel_ack_message(struct skinny_req *req, struc
        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);
@@ -4910,7 +4910,7 @@ static int handle_enbloc_call_message(struct skinny_req *req, struct skinnysessi
        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);
 
@@ -4933,7 +4933,7 @@ static int handle_enbloc_call_message(struct skinny_req *req, struct skinnysessi
                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);
 
@@ -5011,7 +5011,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
 
        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;
        }
 
@@ -5020,11 +5020,11 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
        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");
@@ -5050,7 +5050,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                                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);
@@ -5067,7 +5067,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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);
@@ -5091,7 +5091,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                        }
 
                        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);
@@ -5105,7 +5105,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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) {
@@ -5118,12 +5118,12 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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){
@@ -5140,7 +5140,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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);
@@ -5157,7 +5157,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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);
@@ -5174,7 +5174,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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) {
@@ -5193,11 +5193,11 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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 */
@@ -5208,7 +5208,7 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                        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 */
@@ -5242,11 +5242,11 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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);
@@ -5266,38 +5266,38 @@ static int handle_soft_key_event_message(struct skinny_req *req, struct skinnyse
                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);
@@ -5353,7 +5353,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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;
@@ -5368,7 +5368,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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);
@@ -5417,42 +5417,42 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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;
@@ -5461,13 +5461,13 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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;
@@ -5476,13 +5476,13 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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;
@@ -5494,7 +5494,7 @@ static int handle_message(struct skinny_req *req, struct skinnysession *s)
                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)
@@ -5550,7 +5550,7 @@ static int get_input(struct skinnysession *s)
                }
        } 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;
        }
@@ -5563,7 +5563,7 @@ static int get_input(struct skinnysession *s)
                        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);
@@ -5574,7 +5574,7 @@ static int get_input(struct skinnysession *s)
                        
                        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);
                        }
                     
@@ -5703,7 +5703,7 @@ static void *accept_thread(void *ignore)
                }
        }
        if (skinnydebug)
-               ast_debug(1, "killing accept thread\n");
+               ast_verb(1, "killing accept thread\n");
        close(as);
        return 0;
 }