Don't use channel when you don't mean a channel

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

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index d580b80119f02e662ea548ed490e6f7a2ad21e48..4ea3bd8317b7d50c81deb8849d2414a6a4b06d6f 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5361,7 +5361,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c
                        snprintf(ourip, sizeof(ourip), "%s:%d", ast_inet_ntoa(reg->us.sin_addr), ntohs(reg->us.sin_port));
                        ast_verbose(VERBOSE_PREFIX_3 "Registered IAX2 to '%s', who sees us as %s%s\n", ast_inet_ntoa(sin->sin_addr), ourip, msgstatus);
                }
-               manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: IAX2\r\nDomain: %s\r\nStatus: Registered\r\n", ast_inet_ntoa(sin->sin_addr));
+               manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelDriver: IAX2\r\nDomain: %s\r\nStatus: Registered\r\n", ast_inet_ntoa(sin->sin_addr));
        }
        reg->regstate = REG_STATE_REGISTERED;
        return 0;
@@ -7308,7 +7308,7 @@ retryowner2:
                                if (iaxs[fr->callno]->reg) {
                                        if (authdebug) {
                                                ast_log(LOG_NOTICE, "Registration of '%s' rejected: '%s' from: '%s'\n", iaxs[fr->callno]->reg->username, ies.cause ? ies.cause : "<unknown>", ast_inet_ntoa(sin.sin_addr));
-                                               manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: IAX2\r\nUsername: %s\r\nStatus: Rejected\r\nCause: %s\r\n", iaxs[fr->callno]->reg->username, ies.cause ? ies.cause : "<unknown>");
+                                               manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelDriver: IAX2\r\nUsername: %s\r\nStatus: Rejected\r\nCause: %s\r\n", iaxs[fr->callno]->reg->username, ies.cause ? ies.cause : "<unknown>");
                                        }
                                        iaxs[fr->callno]->reg->regstate = REG_STATE_REJECTED;
                                }

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 43d36e4f2f8906c8de423de519260b92df24b189..46d670ca667fadfa8e3ec1acf5d333fb36d8f3e7 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6897,7 +6897,7 @@ static int sip_reg_timeout(void *data)
                r->timeout = -1;
                res=transmit_register(r, SIP_REGISTER, NULL, NULL);
        }
-       manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: SIP\r\nUsername: %s\r\nDomain: %s\r\nStatus: %s\r\n", r->username, r->hostname, regstate2str(r->regstate));
+       manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelDriver: SIP\r\nUsername: %s\r\nDomain: %s\r\nStatus: %s\r\n", r->username, r->hostname, regstate2str(r->regstate));
        ASTOBJ_UNREF(r, sip_registry_destroy);
        return 0;
 }
@@ -11599,7 +11599,7 @@ static int handle_response_register(struct sip_pvt *p, int resp, char *rest, str
 
                r->regstate = REG_STATE_REGISTERED;
                r->regtime = time(NULL);                /* Reset time of last succesful registration */
-               manager_event(EVENT_FLAG_SYSTEM, "Registry", "Channel: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));
+               manager_event(EVENT_FLAG_SYSTEM, "Registry", "ChannelDriver: SIP\r\nDomain: %s\r\nStatus: %s\r\n", r->hostname, regstate2str(r->regstate));
                r->regattempts = 0;
                ast_log(LOG_DEBUG, "Registration successful\n");
                if (r->timeout > -1) {