make 'sip debug' work again (commands must be registered shortest-first when they...

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 67c39f4..db64a63 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11167,6 +11167,7 @@ static struct ast_cli_entry  my_clis[] = {
        { { "sip", "show", "channels", NULL }, sip_show_channels, "Show active SIP channels", show_channels_usage},
        { { "sip", "show", "channel", NULL }, sip_show_channel, "Show detailed SIP channel info", show_channel_usage, complete_sipch  },
        { { "sip", "show", "history", NULL }, sip_show_history, "Show SIP dialog history", show_history_usage, complete_sipch  },
        { { "sip", "show", "channels", NULL }, sip_show_channels, "Show active SIP channels", show_channels_usage},
        { { "sip", "show", "channel", NULL }, sip_show_channel, "Show detailed SIP channel info", show_channel_usage, complete_sipch  },
        { { "sip", "show", "history", NULL }, sip_show_history, "Show SIP dialog history", show_history_usage, complete_sipch  },

+       { { "sip", "debug", NULL }, sip_do_debug, "Enable SIP debugging", debug_usage },

        { { "sip", "debug", "ip", NULL }, sip_do_debug, "Enable SIP debugging on IP", debug_usage },
        { { "sip", "debug", "peer", NULL }, sip_do_debug, "Enable SIP debugging on Peername", debug_usage, complete_sip_debug_peer },
        { { "sip", "show", "peer", NULL }, sip_show_peer, "Show details on specific SIP peer", show_peer_usage, complete_sip_show_peer },
        { { "sip", "debug", "ip", NULL }, sip_do_debug, "Enable SIP debugging on IP", debug_usage },
        { { "sip", "debug", "peer", NULL }, sip_do_debug, "Enable SIP debugging on Peername", debug_usage, complete_sip_debug_peer },
        { { "sip", "show", "peer", NULL }, sip_show_peer, "Show details on specific SIP peer", show_peer_usage, complete_sip_show_peer },

@@ -11179,7 +11180,6 @@ static struct ast_cli_entry  my_clis[] = {
          "Prune cached Realtime user(s)", prune_realtime_usage, complete_sip_prune_realtime_user },
        { { "sip", "show", "inuse", NULL }, sip_show_inuse, "List all inuse/limits", show_inuse_usage },
        { { "sip", "show", "registry", NULL }, sip_show_registry, "Show SIP registration status", show_reg_usage },
          "Prune cached Realtime user(s)", prune_realtime_usage, complete_sip_prune_realtime_user },
        { { "sip", "show", "inuse", NULL }, sip_show_inuse, "List all inuse/limits", show_inuse_usage },
        { { "sip", "show", "registry", NULL }, sip_show_registry, "Show SIP registration status", show_reg_usage },

-       { { "sip", "debug", NULL }, sip_do_debug, "Enable SIP debugging", debug_usage },

        { { "sip", "history", NULL }, sip_do_history, "Enable SIP history", history_usage },
        { { "sip", "no", "history", NULL }, sip_no_history, "Disable SIP history", no_history_usage },
        { { "sip", "no", "debug", NULL }, sip_no_debug, "Disable SIP debugging", no_debug_usage },
        { { "sip", "history", NULL }, sip_do_history, "Enable SIP history", history_usage },
        { { "sip", "no", "history", NULL }, sip_no_history, "Disable SIP history", no_history_usage },
        { { "sip", "no", "debug", NULL }, sip_no_debug, "Disable SIP debugging", no_debug_usage },