sysmocom/asterisk
11
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reduce duplicated code by using print_codec_to_cli in sip_show_user as it is

Browse source 
already used in sip_show_peer (issue #7739, DEA)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@39932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant 2006-08-15 22:17:38 +00:00
parent 8a0b9236a7
commit 65373a1987
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
channels/chan_sip.c
View file

@ -9686,7 +9686,6 @@ static int _sip_show_peer(int type, int fd, struct mansession *s, struct message
ast_cli(fd, "%s\n", codec_buf); ast_cli(fd, "%s\n", codec_buf);
ast_cli(fd, " Codec Order : ("); ast_cli(fd, " Codec Order : (");
print_codec_to_cli(fd, &peer->prefs); print_codec_to_cli(fd, &peer->prefs);
ast_cli(fd, ")\n"); ast_cli(fd, ")\n");
ast_cli(fd, " Status : "); ast_cli(fd, " Status : ");
@ -9789,9 +9788,8 @@ static int sip_show_user(int fd, int argc, char *argv[])
{ {
char cbuf[256]; char cbuf[256];
struct sip_user *user; struct sip_user *user;
struct ast_codec_pref *pref;
struct ast_variable *v; struct ast_variable *v;
int x = 0, codec = 0, load_realtime; int load_realtime;
if (argc < 4) if (argc < 4)
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
@ -9821,18 +9819,7 @@ static int sip_show_user(int fd, int argc, char *argv[])
ast_cli(fd, " Callerid : %s\n", ast_callerid_merge(cbuf, sizeof(cbuf), user->cid_name, user->cid_num, "<unspecified>")); ast_cli(fd, " Callerid : %s\n", ast_callerid_merge(cbuf, sizeof(cbuf), user->cid_name, user->cid_num, "<unspecified>"));
ast_cli(fd, " ACL : %s\n", (user->ha?"Yes":"No")); ast_cli(fd, " ACL : %s\n", (user->ha?"Yes":"No"));
ast_cli(fd, " Codec Order : ("); ast_cli(fd, " Codec Order : (");
pref = &user->prefs; print_codec_to_cli(fd, &user->prefs);
for(x = 0; x < 32 ; x++) {
codec = ast_codec_pref_index(pref,x);
if (!codec)
break;
ast_cli(fd, "%s", ast_getformatname(codec));
if (x < 31 && ast_codec_pref_index(pref,x+1))
ast_cli(fd, "|");
}
if (!x)
ast_cli(fd, "none");
ast_cli(fd, ")\n"); ast_cli(fd, ")\n");
if (user->chanvars) { if (user->chanvars) {