Be consistent with User/Username (bug #4916)

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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index ce4c480e098ae891f369a541a33e58e9167ec060..e0b4d784244663c98f1f69b64d4125bbec26816b 100755 (executable)
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -40,6 +40,9 @@ SIP:
   the other channel drivers and to avoid confusion with the "port"
   option for users/peers.
 
+* The "Registry" event now uses "Username" rather than "User" for 
+  consistency with IAX.
+
 Applications:
 
 * With the addition of dialplan functions (which operate similarly

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 802e497f84f475b348f74d47a68005e683208b6a..1fc44f7deed240b7c05a227bb593509043f5e09f 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4737,7 +4737,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\nUser: %s\r\nDomain: %s\r\nStatus: %s\r\n", r->username, r->hostname, regstate2str(r->regstate));
+       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));
        ASTOBJ_UNREF(r,sip_registry_destroy);
        return 0;
 }