dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 43707 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r43707 | file | 2006-09-26 16:47:26 -0400 (Tue, 26 Sep 2006) | 10 lines

Merged revisions 43705 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43705 | file | 2006-09-26 16:38:06 -0400 (Tue, 26 Sep 2006) | 2 lines

Use proper type to represent the group variable (issue #8025 reported by makoto)

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43709 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
file 2006-09-26 20:51:36 +00:00
parent dbf37d137d
commit 3ec950000a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cleancount
View File

@ -1 +1 @@
24
25

4
channels/chan_sip.c
View File

@ -1305,7 +1305,7 @@ static int _sip_show_peers(int fd, int *total, struct mansession *s, struct mess
static int manager_sip_show_peers( struct mansession *s, struct message *m );
static int sip_show_peers(int fd, int argc, char *argv[]);
static int sip_show_objects(int fd, int argc, char *argv[]);
static void print_group(int fd, unsigned int group, int crlf);
static void print_group(int fd, ast_group_t group, int crlf);
static const char *dtmfmode2str(int mode) attribute_const;
static const char *insecure2str(int port, int invite) attribute_const;
static void cleanup_stale_contexts(char *new, char *old);
@ -9371,7 +9371,7 @@ static int sip_show_objects(int fd, int argc, char *argv[])
return RESULT_SUCCESS;
}
/*! \brief Print call group and pickup group */
static void print_group(int fd, unsigned int group, int crlf)
static void print_group(int fd, ast_group_t group, int crlf)
{
char buf[256];
ast_cli(fd, crlf ? "%s\r\n" : "%s\n", ast_print_group(buf, sizeof(buf), group) );

4
include/asterisk/channel.h
View File

@ -407,8 +407,8 @@ struct ast_channel {
unsigned int fout;
int hangupcause; /*!< Why is the channel hanged up. See causes.h */
struct varshead varshead; /*!< A linked list for channel variables */
unsigned int callgroup; /*!< Call group for call pickups */
unsigned int pickupgroup; /*!< Pickup group - which calls groups can be picked up? */
ast_group_t callgroup; /*!< Call group for call pickups */
ast_group_t pickupgroup; /*!< Pickup group - which calls groups can be picked up? */
unsigned int flags; /*!< channel flags of AST_FLAG_ type */
unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
AST_LIST_HEAD_NOLOCK(, ast_frame) readq;

4
main/cli.c
View File

@ -724,8 +724,8 @@ static int handle_showchan(int fd, int argc, char *argv[])
" Context: %s\n"
" Extension: %s\n"
" Priority: %d\n"
" Call Group: %d\n"
" Pickup Group: %d\n"
" Call Group: %lld\n"
" Pickup Group: %lld\n"
" Application: %s\n"
" Data: %s\n"
" Blocking in: %s\n",