[svn-commits] dvossel: trunk r201331 - /trunk/channels/chan_iax2.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jun 17 09:42:09 CDT 2009
Author: dvossel
Date: Wed Jun 17 09:42:06 2009
New Revision: 201331
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201331
Log:
update chan_iax to use 64bit feature flags.
Modified:
trunk/channels/chan_iax2.c
Modified: trunk/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=201331&r1=201330&r2=201331
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Wed Jun 17 09:42:06 2009
@@ -254,10 +254,10 @@
/*! \brief Maximum transmission unit for the UDP packet in the trunk not to be
fragmented. This is based on 1516 - ethernet - ip - udp - iax minus one g711 frame = 1240 */
-#define MAX_TRUNK_MTU 1240
-
-static int global_max_trunk_mtu; /*!< Maximum MTU, 0 if not used */
-static int trunk_timed, trunk_untimed, trunk_maxmtu, trunk_nmaxmtu ; /*!< Trunk MTU statistics */
+#define MAX_TRUNK_MTU 1240
+
+static int global_max_trunk_mtu; /*!< Maximum MTU, 0 if not used */
+static int trunk_timed, trunk_untimed, trunk_maxmtu, trunk_nmaxmtu ; /*!< Trunk MTU statistics */
#define DEFAULT_CONTEXT "default"
@@ -308,24 +308,24 @@
static int (*iax2_regfunk)(const char *username, int onoff) = NULL;
/* Ethernet, etc */
-#define IAX_CAPABILITY_FULLBANDWIDTH 0xFFFF
+#define IAX_CAPABILITY_FULLBANDWIDTH 0xFFFF
/* T1, maybe ISDN */
-#define IAX_CAPABILITY_MEDBANDWIDTH (IAX_CAPABILITY_FULLBANDWIDTH & \
- ~AST_FORMAT_SLINEAR & \
- ~AST_FORMAT_SLINEAR16 & \
- ~AST_FORMAT_SIREN7 & \
- ~AST_FORMAT_SIREN14 & \
- ~AST_FORMAT_ULAW & \
- ~AST_FORMAT_ALAW & \
- ~AST_FORMAT_G722)
+#define IAX_CAPABILITY_MEDBANDWIDTH (IAX_CAPABILITY_FULLBANDWIDTH & \
+ ~AST_FORMAT_SLINEAR & \
+ ~AST_FORMAT_SLINEAR16 & \
+ ~AST_FORMAT_SIREN7 & \
+ ~AST_FORMAT_SIREN14 & \
+ ~AST_FORMAT_ULAW & \
+ ~AST_FORMAT_ALAW & \
+ ~AST_FORMAT_G722)
/* A modem */
-#define IAX_CAPABILITY_LOWBANDWIDTH (IAX_CAPABILITY_MEDBANDWIDTH & \
- ~AST_FORMAT_G726 & \
- ~AST_FORMAT_G726_AAL2 & \
- ~AST_FORMAT_ADPCM)
-
-#define IAX_CAPABILITY_LOWFREE (IAX_CAPABILITY_LOWBANDWIDTH & \
- ~AST_FORMAT_G723_1)
+#define IAX_CAPABILITY_LOWBANDWIDTH (IAX_CAPABILITY_MEDBANDWIDTH & \
+ ~AST_FORMAT_G726 & \
+ ~AST_FORMAT_G726_AAL2 & \
+ ~AST_FORMAT_ADPCM)
+
+#define IAX_CAPABILITY_LOWFREE (IAX_CAPABILITY_LOWBANDWIDTH & \
+ ~AST_FORMAT_G723_1)
#define DEFAULT_MAXMS 2000 /* Must be faster than 2 seconds by default */
@@ -334,7 +334,7 @@
/* if a pvt has encryption setup done and is running on the call */
#define IAX_CALLENCRYPTED(pvt) \
- (ast_test_flag(pvt, IAX_ENCRYPTED) && ast_test_flag(pvt, IAX_KEYPOPULATED))
+ (ast_test_flag64(pvt, IAX_ENCRYPTED) && ast_test_flag64(pvt, IAX_KEYPOPULATED))
#define IAX_DEBUGDIGEST(msg, key) do { \
int idx; \
@@ -374,7 +374,7 @@
static int delayreject = 0;
static int iax2_encryption = 0;
-static struct ast_flags globalflags = { 0 };
+static struct ast_flags64 globalflags = { 0 };
static pthread_t netthreadid = AST_PTHREADT_NULL;
@@ -389,41 +389,38 @@
struct iax2_context *next;
};
-enum iax2_flags {
- IAX_HASCALLERID = (1 << 0), /*!< CallerID has been specified */
- IAX_DELME = (1 << 1), /*!< Needs to be deleted */
- IAX_TEMPONLY = (1 << 2), /*!< Temporary (realtime) */
- IAX_TRUNK = (1 << 3), /*!< Treat as a trunk */
- IAX_NOTRANSFER = (1 << 4), /*!< Don't native bridge */
- IAX_USEJITTERBUF = (1 << 5), /*!< Use jitter buffer */
- IAX_DYNAMIC = (1 << 6), /*!< dynamic peer */
- IAX_SENDANI = (1 << 7), /*!< Send ANI along with CallerID */
+
+#define IAX_HASCALLERID (uint64_t)(1 << 0) /*!< CallerID has been specified */
+#define IAX_DELME (uint64_t)(1 << 1) /*!< Needs to be deleted */
+#define IAX_TEMPONLY (uint64_t)(1 << 2) /*!< Temporary (realtime) */
+#define IAX_TRUNK (uint64_t)(1 << 3) /*!< Treat as a trunk */
+#define IAX_NOTRANSFER (uint64_t)(1 << 4) /*!< Don't native bridge */
+#define IAX_USEJITTERBUF (uint64_t)(1 << 5) /*!< Use jitter buffer */
+#define IAX_DYNAMIC (uint64_t)(1 << 6) /*!< dynamic peer */
+#define IAX_SENDANI (uint64_t)(1 << 7) /*!< Send ANI along with CallerID */
/* (1 << 8) is currently unused due to the deprecation of an old option. Go ahead, take it! */
- IAX_ALREADYGONE = (1 << 9), /*!< Already disconnected */
- IAX_PROVISION = (1 << 10), /*!< This is a provisioning request */
- IAX_QUELCH = (1 << 11), /*!< Whether or not we quelch audio */
- IAX_ENCRYPTED = (1 << 12), /*!< Whether we should assume encrypted tx/rx */
- IAX_KEYPOPULATED = (1 << 13), /*!< Whether we have a key populated */
- IAX_CODEC_USER_FIRST = (1 << 14), /*!< are we willing to let the other guy choose the codec? */
- IAX_CODEC_NOPREFS = (1 << 15), /*!< Force old behaviour by turning off prefs */
- IAX_CODEC_NOCAP = (1 << 16), /*!< only consider requested format and ignore capabilities*/
- IAX_RTCACHEFRIENDS = (1 << 17), /*!< let realtime stay till your reload */
- IAX_RTUPDATE = (1 << 18), /*!< Send a realtime update */
- IAX_RTAUTOCLEAR = (1 << 19), /*!< erase me on expire */
- IAX_FORCEJITTERBUF = (1 << 20), /*!< Force jitterbuffer, even when bridged to a channel that can take jitter */
- IAX_RTIGNOREREGEXPIRE = (1 << 21), /*!< When using realtime, ignore registration expiration */
- IAX_TRUNKTIMESTAMPS = (1 << 22), /*!< Send trunk timestamps */
- IAX_TRANSFERMEDIA = (1 << 23), /*!< When doing IAX2 transfers, transfer media only */
- IAX_MAXAUTHREQ = (1 << 24), /*!< Maximum outstanding AUTHREQ restriction is in place */
- IAX_DELAYPBXSTART = (1 << 25), /*!< Don't start a PBX on the channel until the peer sends us a
- response, so that we've achieved a three-way handshake with
- them before sending voice or anything else*/
- IAX_ALLOWFWDOWNLOAD = (1 << 26), /*!< Allow the FWDOWNL command? */
- IAX_IMMEDIATE = (1 << 27), /*!< Allow immediate off-hook to extension s */
- IAX_SENDCONNECTEDLINE = (1 << 28), /*!< Allow sending of connected line updates */
- IAX_RECVCONNECTEDLINE = (1 << 29), /*!< Allow receiving of connected line updates */
- IAX_FORCE_ENCRYPT = (1 << 30), /*!< Forces call encryption, if encryption not possible hangup */
-};
+#define IAX_ALREADYGONE (uint64_t)(1 << 9) /*!< Already disconnected */
+#define IAX_PROVISION (uint64_t)(1 << 10) /*!< This is a provisioning request */
+#define IAX_QUELCH (uint64_t)(1 << 11) /*!< Whether or not we quelch audio */
+#define IAX_ENCRYPTED (uint64_t)(1 << 12) /*!< Whether we should assume encrypted tx/rx */
+#define IAX_KEYPOPULATED (uint64_t)(1 << 13) /*!< Whether we have a key populated */
+#define IAX_CODEC_USER_FIRST (uint64_t)(1 << 14) /*!< are we willing to let the other guy choose the codec? */
+#define IAX_CODEC_NOPREFS (uint64_t)(1 << 15) /*!< Force old behaviour by turning off prefs */
+#define IAX_CODEC_NOCAP (uint64_t)(1 << 16) /*!< only consider requested format and ignore capabilities*/
+#define IAX_RTCACHEFRIENDS (uint64_t)(1 << 17) /*!< let realtime stay till your reload */
+#define IAX_RTUPDATE (uint64_t)(1 << 18) /*!< Send a realtime update */
+#define IAX_RTAUTOCLEAR (uint64_t)(1 << 19) /*!< erase me on expire */
+#define IAX_FORCEJITTERBUF (uint64_t)(1 << 20) /*!< Force jitterbuffer, even when bridged to a channel that can take jitter */
+#define IAX_RTIGNOREREGEXPIRE (uint64_t)(1 << 21) /*!< When using realtime, ignore registration expiration */
+#define IAX_TRUNKTIMESTAMPS (uint64_t)(1 << 22) /*!< Send trunk timestamps */
+#define IAX_TRANSFERMEDIA (uint64_t)(1 << 23) /*!< When doing IAX2 transfers, transfer media only */
+#define IAX_MAXAUTHREQ (uint64_t)(1 << 24) /*!< Maximum outstanding AUTHREQ restriction is in place */
+#define IAX_DELAYPBXSTART (uint64_t)(1 << 25) /*!< Don't start a PBX on the channel until the peer sends us a response, so that we've achieved a three-way handshake with them before sending voice or anything else */
+#define IAX_ALLOWFWDOWNLOAD (uint64_t)(1 << 26) /*!< Allow the FWDOWNL command? */
+#define IAX_IMMEDIATE (uint64_t)(1 << 27) /*!< Allow immediate off-hook to extension s */
+#define IAX_SENDCONNECTEDLINE (uint64_t)(1 << 28) /*!< Allow sending of connected line updates */
+#define IAX_RECVCONNECTEDLINE (uint64_t)(1 << 29) /*!< Allow receiving of connected line updates */
+#define IAX_FORCE_ENCRYPT (uint64_t)(1 << 30) /*!< Forces call encryption, if encryption not possible hangup */
static int global_rtautoclear = 120;
@@ -443,12 +440,12 @@
AST_STRING_FIELD(cid_name);
AST_STRING_FIELD(parkinglot); /*!< Default parkinglot for device */
);
-
+
int authmethods;
int encmethods;
int amaflags;
int adsi;
- unsigned int flags;
+ uint64_t flags;
int capability;
int maxauthreq; /*!< Maximum allowed outstanding AUTHREQs */
int curauthreq; /*!< Current number of outstanding AUTHREQs */
@@ -486,7 +483,7 @@
int sockfd; /*!< Socket to use for transmission */
struct in_addr mask;
int adsi;
- unsigned int flags;
+ uint64_t flags;
/* Dynamic Registration fields */
struct sockaddr_in defaddr; /*!< Default address if there is one */
@@ -587,10 +584,10 @@
/* Don't retry more frequently than every 10 ms, or less frequently than every 5 seconds */
#define MIN_RETRY_TIME 100
-#define MAX_RETRY_TIME 10000
-
-#define MAX_JITTER_BUFFER 50
-#define MIN_JITTER_BUFFER 10
+#define MAX_RETRY_TIME 10000
+
+#define MAX_JITTER_BUFFER 50
+#define MIN_JITTER_BUFFER 10
#define DEFAULT_TRUNKDATA 640 * 10 /*!< 40ms, uncompressed linear * 10 channels */
@@ -676,7 +673,7 @@
/*! The jitterbuffer */
jitterbuf *jb;
/*! active jb read scheduler id */
- int jbid;
+ int jbid;
/*! LAG */
int lag;
/*! Error, as discovered by the manager */
@@ -758,7 +755,7 @@
/*! Associated peer for poking */
struct iax2_peer *peerpoke;
/*! IAX_ flags */
- unsigned int flags;
+ uint64_t flags;
int adsi;
/*! Transferring status */
@@ -777,7 +774,7 @@
/*! Who we are bridged to */
unsigned short bridgecallno;
-
+
int pingid; /*!< Transmit PING request */
int lagid; /*!< Retransmit lag request */
int autoid; /*!< Auto hangup for Dialplan requestor */
@@ -872,7 +869,7 @@
static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in *sin);
static int ast_cli_netstats(struct mansession *s, int fd, int limit_fmt);
-static char *complete_iax2_peers(const char *line, const char *word, int pos, int state, int flags);
+static char *complete_iax2_peers(const char *line, const char *word, int pos, int state, uint64_t flags);
static char *complete_iax2_unregister(const char *line, const char *word, int pos, int state);
enum iax2_thread_iostate {
@@ -1593,7 +1590,7 @@
static void iax2_destroy_helper(struct chan_iax2_pvt *pvt)
{
/* Decrement AUTHREQ count if needed */
- if (ast_test_flag(pvt, IAX_MAXAUTHREQ)) {
+ if (ast_test_flag64(pvt, IAX_MAXAUTHREQ)) {
struct iax2_user *user;
struct iax2_user tmp_user = {
.name = pvt->username,
@@ -1602,10 +1599,10 @@
user = ao2_find(users, &tmp_user, OBJ_POINTER);
if (user) {
ast_atomic_fetchadd_int(&user->curauthreq, -1);
- user_unref(user);
- }
-
- ast_clear_flag(pvt, IAX_MAXAUTHREQ);
+ user_unref(user);
+ }
+
+ ast_clear_flag64(pvt, IAX_MAXAUTHREQ);
}
/* No more pings or lagrq's */
AST_SCHED_DEL_SPINLOCK(ast_sched_thread_get_context(sched), pvt->pingid, &iaxsl[pvt->callno]);
@@ -1647,7 +1644,7 @@
iax2_destroy_helper(pvt);
/* Already gone */
- ast_set_flag(pvt, IAX_ALREADYGONE);
+ ast_set_flag64(pvt, IAX_ALREADYGONE);
AST_LIST_TRAVERSE(&frame_queue[pvt->callno], cur, list) {
/* Cancel any pending transmissions */
@@ -2000,7 +1997,7 @@
break;
}
ast_mutex_unlock(&iaxsl[x]);
-
+
if (x == start - 1) {
break;
}
@@ -2026,7 +2023,7 @@
iaxs[x]->pingid = iax2_sched_add(sched, ping_time * 1000, send_ping, (void *)(long)x);
iaxs[x]->lagid = iax2_sched_add(sched, lagrq_time * 1000, send_lagrq, (void *)(long)x);
iaxs[x]->amaflags = amaflags;
- ast_copy_flags(iaxs[x], &globalflags, IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE | IAX_FORCE_ENCRYPT);
+ ast_copy_flags64(iaxs[x], &globalflags, IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE | IAX_FORCE_ENCRYPT);
ast_string_field_set(iaxs[x], accountcode, accountcode);
ast_string_field_set(iaxs[x], mohinterpret, mohinterpret);
ast_string_field_set(iaxs[x], mohsuggest, mohsuggest);
@@ -2413,7 +2410,7 @@
struct iax_frame *fr = data;
fr->retrans = -1;
ast_clear_flag(&fr->af, AST_FRFLAG_HAS_TIMING_INFO);
- if (iaxs[fr->callno] && !ast_test_flag(iaxs[fr->callno], IAX_ALREADYGONE))
+ if (iaxs[fr->callno] && !ast_test_flag64(iaxs[fr->callno], IAX_ALREADYGONE))
iax2_queue_frame(fr->callno, &fr->af);
/* Free our iax frame */
iax2_frame_free(fr);
@@ -2512,9 +2509,9 @@
if (!pvt)
return -1;
- if (!ast_test_flag(pvt, IAX_ALREADYGONE)) {
+ if (!ast_test_flag64(pvt, IAX_ALREADYGONE)) {
iax2_destroy_helper(pvt);
- ast_set_flag(pvt, IAX_ALREADYGONE);
+ ast_set_flag64(pvt, IAX_ALREADYGONE);
}
if ((c = pvt->owner)) {
@@ -2733,8 +2730,8 @@
user = find_user(a->argv[3]);
if (peer || user) {
if (peer) {
- if (ast_test_flag(peer, IAX_RTCACHEFRIENDS)) {
- ast_set_flag(peer, IAX_RTAUTOCLEAR);
+ if (ast_test_flag64(peer, IAX_RTCACHEFRIENDS)) {
+ ast_set_flag64(peer, IAX_RTAUTOCLEAR);
expire_registry(peer_ref(peer));
ast_cli(a->fd, "Peer %s was removed from the cache.\n", a->argv[3]);
} else {
@@ -2743,8 +2740,8 @@
peer_unref(peer);
}
if (user) {
- if (ast_test_flag(user, IAX_RTCACHEFRIENDS)) {
- ast_set_flag(user, IAX_RTAUTOCLEAR);
+ if (ast_test_flag64(user, IAX_RTCACHEFRIENDS)) {
+ ast_set_flag64(user, IAX_RTAUTOCLEAR);
ast_cli(a->fd, "User %s was removed from the cache.\n", a->argv[3]);
} else {
ast_cli(a->fd, "User %s is not eligible for this operation.\n", a->argv[3]);
@@ -2909,8 +2906,8 @@
ast_cli(a->fd, " Context : %s\n", peer->context);
ast_cli(a->fd, " Parking lot : %s\n", peer->parkinglot);
ast_cli(a->fd, " Mailbox : %s\n", peer->mailbox);
- ast_cli(a->fd, " Dynamic : %s\n", ast_test_flag(peer, IAX_DYNAMIC) ? "Yes" : "No");
- ast_cli(a->fd, " Trunk : %s\n", ast_test_flag(peer, IAX_TRUNK) ? "Yes" : "No");
+ ast_cli(a->fd, " Dynamic : %s\n", ast_test_flag64(peer, IAX_DYNAMIC) ? "Yes" : "No");
+ ast_cli(a->fd, " Trunk : %s\n", ast_test_flag64(peer, IAX_TRUNK) ? "Yes" : "No");
ast_cli(a->fd, " Encryption : %s\n", peer->encmethods ? ast_str_buffer(encmethods) : "No");
ast_cli(a->fd, " Callerid : %s\n", ast_callerid_merge(cbuf, sizeof(cbuf), peer->cid_name, peer->cid_num, "<unspecified>"));
ast_cli(a->fd, " Expire : %d\n", peer->expire);
@@ -2950,7 +2947,7 @@
return CLI_SUCCESS;
}
-static char *complete_iax2_peers(const char *line, const char *word, int pos, int state, int flags)
+static char *complete_iax2_peers(const char *line, const char *word, int pos, int state, uint64_t flags)
{
int which = 0;
struct iax2_peer *peer;
@@ -2961,7 +2958,7 @@
i = ao2_iterator_init(peers, 0);
while ((peer = ao2_iterator_next(&i))) {
if (!strncasecmp(peer->name, word, wordlen) && ++which > state
- && (!flags || ast_test_flag(peer, flags))) {
+ && (!flags || ast_test_flag64(peer, flags))) {
res = ast_strdup(peer->name);
peer_unref(peer);
break;
@@ -3235,7 +3232,7 @@
/* queue the frame: For consistency, we would call __do_deliver here, but __do_deliver wants an iax_frame,
* which we'd need to malloc, and then it would free it. That seems like a drag */
- if (!ast_test_flag(iaxs[callno], IAX_ALREADYGONE)) {
+ if (!ast_test_flag64(iaxs[callno], IAX_ALREADYGONE)) {
iax2_queue_frame(callno, &af);
/* iax2_queue_frame() could cause the call to disappear */
pvt = iaxs[callno];
@@ -3305,7 +3302,7 @@
type = JB_TYPE_SILENCE;
}
- if ( (!ast_test_flag(iaxs[fr->callno], IAX_USEJITTERBUF)) ) {
+ if ( (!ast_test_flag64(iaxs[fr->callno], IAX_USEJITTERBUF)) ) {
if (tsout)
*tsout = fr->ts;
__do_deliver(fr);
@@ -3317,7 +3314,7 @@
/* if the user hasn't requested we force the use of the jitterbuffer, and we're bridged to
* a channel that can accept jitter, then flush and suspend the jb, and send this frame straight through */
- if ( (!ast_test_flag(iaxs[fr->callno], IAX_FORCEJITTERBUF)) && owner && bridge && (bridge->tech->properties & AST_CHAN_TP_WANTSJITTER) ) {
+ if ( (!ast_test_flag64(iaxs[fr->callno], IAX_FORCEJITTERBUF)) && owner && bridge && (bridge->tech->properties & AST_CHAN_TP_WANTSJITTER) ) {
jb_frame frame;
/* deliver any frames in the jb */
@@ -3485,8 +3482,8 @@
if (!var)
return NULL;
- peer = build_peer(peername, var, NULL, ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS) ? 0 : 1);
-
+ peer = build_peer(peername, var, NULL, ast_test_flag64((&globalflags), IAX_RTCACHEFRIENDS) ? 0 : 1);
+
if (!peer) {
ast_variables_destroy(var);
return NULL;
@@ -3518,27 +3515,27 @@
if (!peer)
return NULL;
- if (ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS)) {
- ast_copy_flags(peer, &globalflags, IAX_RTAUTOCLEAR|IAX_RTCACHEFRIENDS);
- if (ast_test_flag(peer, IAX_RTAUTOCLEAR)) {
- if (peer->expire > -1) {
- if (!ast_sched_thread_del(sched, peer->expire)) {
- peer->expire = -1;
- peer_unref(peer);
- }
- }
- peer->expire = iax2_sched_add(sched, (global_rtautoclear) * 1000, expire_registry, peer_ref(peer));
- if (peer->expire == -1)
- peer_unref(peer);
+ if (ast_test_flag64((&globalflags), IAX_RTCACHEFRIENDS)) {
+ ast_copy_flags64(peer, &globalflags, IAX_RTAUTOCLEAR|IAX_RTCACHEFRIENDS);
+ if (ast_test_flag64(peer, IAX_RTAUTOCLEAR)) {
+ if (peer->expire > -1) {
+ if (!ast_sched_thread_del(sched, peer->expire)) {
+ peer->expire = -1;
+ peer_unref(peer);
+ }
+ }
+ peer->expire = iax2_sched_add(sched, (global_rtautoclear) * 1000, expire_registry, peer_ref(peer));
+ if (peer->expire == -1)
+ peer_unref(peer);
}
ao2_link(peers, peer);
- if (ast_test_flag(peer, IAX_DYNAMIC))
+ if (ast_test_flag64(peer, IAX_DYNAMIC))
reg_source_db(peer);
} else {
- ast_set_flag(peer, IAX_TEMPONLY);
- }
-
- if (!ast_test_flag(&globalflags, IAX_RTIGNOREREGEXPIRE) && dynamic) {
+ ast_set_flag64(peer, IAX_TEMPONLY);
+ }
+
+ if (!ast_test_flag64(&globalflags, IAX_RTIGNOREREGEXPIRE) && dynamic) {
time(&nowtime);
if ((nowtime - regseconds) > IAX_DEFAULT_REG_EXPIRE) {
memset(&peer->addr, 0, sizeof(peer->addr));
@@ -3609,18 +3606,18 @@
tmp = tmp->next;
}
- user = build_user(username, var, NULL, !ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS));
+ user = build_user(username, var, NULL, !ast_test_flag64((&globalflags), IAX_RTCACHEFRIENDS));
ast_variables_destroy(var);
if (!user)
return NULL;
- if (ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS)) {
- ast_set_flag(user, IAX_RTCACHEFRIENDS);
+ if (ast_test_flag64((&globalflags), IAX_RTCACHEFRIENDS)) {
+ ast_set_flag64(user, IAX_RTCACHEFRIENDS);
ao2_link(users, user);
} else {
- ast_set_flag(user, IAX_TEMPONLY);
+ ast_set_flag64(user, IAX_TEMPONLY);
}
return user;
@@ -3640,7 +3637,7 @@
struct create_addr_info {
int capability;
- unsigned int flags;
+ uint64_t flags;
int maxtime;
int encmethods;
int found;
@@ -3665,7 +3662,7 @@
int res = -1;
struct ast_codec_pref ourprefs;
- ast_clear_flag(cai, IAX_SENDANI | IAX_TRUNK);
+ ast_clear_flag64(cai, IAX_SENDANI | IAX_TRUNK);
cai->sockfd = defaultsockfd;
cai->maxtime = 0;
sin->sin_family = AF_INET;
@@ -3696,7 +3693,7 @@
if (peer->maxms && ((peer->lastms > peer->maxms) || (peer->lastms < 0)))
goto return_unref;
- ast_copy_flags(cai, peer, IAX_SENDANI | IAX_TRUNK | IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE | IAX_FORCE_ENCRYPT);
+ ast_copy_flags64(cai, peer, IAX_SENDANI | IAX_TRUNK | IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE | IAX_FORCE_ENCRYPT);
cai->maxtime = peer->maxms;
cai->capability = peer->capability;
cai->encmethods = peer->encmethods;
@@ -3905,7 +3902,7 @@
ast_log(LOG_WARNING, "No address associated with '%s'\n", pds.peer);
return -1;
}
- if (ast_strlen_zero(cai.secret) && ast_test_flag(iaxs[callno], IAX_FORCE_ENCRYPT)) {
+ if (ast_strlen_zero(cai.secret) && ast_test_flag64(iaxs[callno], IAX_FORCE_ENCRYPT)) {
ast_log(LOG_WARNING, "Call terminated. No secret given and force encrypt enabled\n");
return -1;
}
@@ -3955,7 +3952,7 @@
if (n)
iax_ie_append_str(&ied, IAX_IE_CALLING_NAME, n);
- if (ast_test_flag(iaxs[callno], IAX_SENDANI) && c->connected.ani)
+ if (ast_test_flag64(iaxs[callno], IAX_SENDANI) && c->connected.ani)
iax_ie_append_str(&ied, IAX_IE_CALLING_ANI, c->connected.ani);
if (!ast_strlen_zero(c->language))
@@ -4066,7 +4063,7 @@
ast_mutex_lock(&iaxsl[callno]);
if (callno && iaxs[callno]) {
ast_debug(1, "We're hanging up %s now...\n", c->name);
- alreadygone = ast_test_flag(iaxs[callno], IAX_ALREADYGONE);
+ alreadygone = ast_test_flag64(iaxs[callno], IAX_ALREADYGONE);
/* Send the hangup unless we have had a transmission error or are already gone */
iax_ie_append_byte(&ied, IAX_IE_CAUSECODE, (unsigned char)c->hangupcause);
if (!iaxs[callno]->error && !alreadygone) {
@@ -4221,8 +4218,8 @@
if (IAX_CALLENCRYPTED(iaxs[callno0]) || IAX_CALLENCRYPTED(iaxs[callno1])) {
ast_debug(1, "transfers are not supported for encrypted calls at this time");
- ast_set_flag(iaxs[callno0], IAX_NOTRANSFER);
- ast_set_flag(iaxs[callno1], IAX_NOTRANSFER);
+ ast_set_flag64(iaxs[callno0], IAX_NOTRANSFER);
+ ast_set_flag64(iaxs[callno1], IAX_NOTRANSFER);
return 0;
}
@@ -4328,10 +4325,10 @@
return AST_BRIDGE_FAILED_NOWARN;
}
/* check if transfered and if we really want native bridging */
- if (!transferstarted && !ast_test_flag(iaxs[callno0], IAX_NOTRANSFER) && !ast_test_flag(iaxs[callno1], IAX_NOTRANSFER)) {
+ if (!transferstarted && !ast_test_flag64(iaxs[callno0], IAX_NOTRANSFER) && !ast_test_flag64(iaxs[callno1], IAX_NOTRANSFER)) {
/* Try the transfer */
if (iax2_start_transfer(callno0, callno1, (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) ||
- ast_test_flag(iaxs[callno0], IAX_TRANSFERMEDIA) | ast_test_flag(iaxs[callno1], IAX_TRANSFERMEDIA)))
+ ast_test_flag64(iaxs[callno0], IAX_TRANSFERMEDIA) | ast_test_flag64(iaxs[callno1], IAX_TRANSFERMEDIA)))
ast_log(LOG_WARNING, "Unable to start the transfer\n");
transferstarted = 1;
}
@@ -4458,7 +4455,7 @@
}
break;
case AST_CONTROL_CONNECTED_LINE:
- if (!ast_test_flag(pvt, IAX_SENDCONNECTEDLINE))
+ if (!ast_test_flag64(pvt, IAX_SENDCONNECTEDLINE))
goto done;
break;
}
@@ -4501,7 +4498,7 @@
while ((peer = ao2_iterator_next(&i))) {
if ((peer->addr.sin_addr.s_addr == sin.sin_addr.s_addr) &&
(peer->addr.sin_port == sin.sin_port)) {
- res = ast_test_flag(peer, IAX_TRUNK);
+ res = ast_test_flag64(peer, IAX_TRUNK);
peer_unref(peer);
break;
}
@@ -4913,7 +4910,7 @@
/* Append to meta frame */
ptr = tpeer->trunkdata + IAX2_TRUNK_PREFACE + tpeer->trunkdatalen;
- if (ast_test_flag(&globalflags, IAX_TRUNKTIMESTAMPS)) {
+ if (ast_test_flag64(&globalflags, IAX_TRUNKTIMESTAMPS)) {
mtm = (struct ast_iax2_meta_trunk_mini *)ptr;
mtm->len = htons(f->datalen);
mtm->mini.callno = htons(pvt->callno);
@@ -5116,7 +5113,7 @@
static int decrypt_frame(int callno, struct ast_iax2_full_hdr *fh, struct ast_frame *f, int *datalen)
{
int res=-1;
- if (!ast_test_flag(iaxs[callno], IAX_KEYPOPULATED)) {
+ if (!ast_test_flag64(iaxs[callno], IAX_KEYPOPULATED)) {
/* Search for possible keys, given secrets */
struct MD5Context md5;
unsigned char digest[16];
@@ -5132,7 +5129,7 @@
build_encryption_keys(digest, iaxs[callno]);
res = decode_frame(&iaxs[callno]->dcx, fh, f, datalen);
if (!res) {
- ast_set_flag(iaxs[callno], IAX_KEYPOPULATED);
+ ast_set_flag64(iaxs[callno], IAX_KEYPOPULATED);
break;
}
}
@@ -5188,7 +5185,7 @@
iax2_key_rotate(pvt);
}
- if ((ast_test_flag(pvt, IAX_TRUNK) ||
+ if ((ast_test_flag64(pvt, IAX_TRUNK) ||
(((fts & 0xFFFF0000L) == (lastsent & 0xFFFF0000L)) ||
((fts & 0xFFFF0000L) == ((lastsent + 0x10000) & 0xFFFF0000L))))
/* High two bytes are the same on timestamp, or sending on a trunk */ &&
@@ -5229,7 +5226,7 @@
if (now) {
fr = &frb.fr2;
} else
- fr = iax_frame_new(DIRECTION_OUTGRESS, ast_test_flag(pvt, IAX_ENCRYPTED) ? f->datalen + 32 : f->datalen, (f->frametype == AST_FRAME_VOICE) || (f->frametype == AST_FRAME_VIDEO));
+ fr = iax_frame_new(DIRECTION_OUTGRESS, ast_test_flag64(pvt, IAX_ENCRYPTED) ? f->datalen + 32 : f->datalen, (f->frametype == AST_FRAME_VOICE) || (f->frametype == AST_FRAME_VIDEO));
if (!fr) {
ast_log(LOG_WARNING, "Out of memory\n");
return -1;
@@ -5286,8 +5283,8 @@
pvt->svoiceformat = f->subclass;
else if (f->frametype == AST_FRAME_VIDEO)
pvt->svideoformat = f->subclass & ~0x1;
- if (ast_test_flag(pvt, IAX_ENCRYPTED)) {
- if (ast_test_flag(pvt, IAX_KEYPOPULATED)) {
+ if (ast_test_flag64(pvt, IAX_ENCRYPTED)) {
+ if (ast_test_flag64(pvt, IAX_KEYPOPULATED)) {
if (fr->transfer)
iax_outputframe(fr, NULL, 2, &pvt->transfer, fr->datalen - sizeof(struct ast_iax2_full_hdr));
else
@@ -5306,7 +5303,7 @@
} else
res = iax2_transmit(fr);
} else {
- if (ast_test_flag(pvt, IAX_TRUNK)) {
+ if (ast_test_flag64(pvt, IAX_TRUNK)) {
iax2_trunk_queue(pvt, fr);
res = 0;
} else if (fr->af.frametype == AST_FRAME_VIDEO) {
@@ -5334,8 +5331,8 @@
fr->retries = -1;
if (pvt->transferring == TRANSFER_MEDIAPASS)
fr->transfer = 1;
- if (ast_test_flag(pvt, IAX_ENCRYPTED)) {
- if (ast_test_flag(pvt, IAX_KEYPOPULATED)) {
+ if (ast_test_flag64(pvt, IAX_ENCRYPTED)) {
+ if (ast_test_flag64(pvt, IAX_KEYPOPULATED)) {
encrypt_frame(&pvt->ecx, (struct ast_iax2_full_hdr *)mh, pvt->semirand, &fr->datalen);
} else
ast_log(LOG_WARNING, "Supposed to send packet encrypted, but no key?\n");
@@ -5391,21 +5388,21 @@
user_unref(user), user = ao2_iterator_next(&i)) {
if (havepattern && regexec(®exbuf, user->name, 0, NULL, 0))
continue;
-
+
if (!ast_strlen_zero(user->secret)) {
- ast_copy_string(auth,user->secret, sizeof(auth));
+ ast_copy_string(auth,user->secret, sizeof(auth));
} else if (!ast_strlen_zero(user->inkeys)) {
- snprintf(auth, sizeof(auth), "Key: %-15.15s ", user->inkeys);
- } else
+ snprintf(auth, sizeof(auth), "Key: %-15.15s ", user->inkeys);
+ } else
ast_copy_string(auth, "-no secret-", sizeof(auth));
-
- if(ast_test_flag(user,IAX_CODEC_NOCAP))
+
+ if(ast_test_flag64(user, IAX_CODEC_NOCAP))
pstr = "REQ Only";
- else if(ast_test_flag(user,IAX_CODEC_NOPREFS))
+ else if(ast_test_flag64(user, IAX_CODEC_NOPREFS))
pstr = "Disabled";
else
- pstr = ast_test_flag(user,IAX_CODEC_USER_FIRST) ? "Caller" : "Host";
-
+ pstr = ast_test_flag64(user, IAX_CODEC_USER_FIRST) ? "Caller" : "Host";
+
ast_cli(a->fd, FORMAT2, user->name, auth, user->authmethods,
user->contexts ? user->contexts->context : DEFAULT_CONTEXT,
user->ha ? "Yes" : "No", pstr);
@@ -5519,17 +5516,17 @@
name,
peer->addr.sin_addr.s_addr ? ast_inet_ntoa(peer->addr.sin_addr) : "-none-",
ntohs(peer->addr.sin_port),
- ast_test_flag(peer, IAX_DYNAMIC) ? "yes" : "no",
- ast_test_flag(peer, IAX_TRUNK) ? "yes" : "no",
+ ast_test_flag64(peer, IAX_DYNAMIC) ? "yes" : "no",
+ ast_test_flag64(peer, IAX_TRUNK) ? "yes" : "no",
peer->encmethods ? ast_str_buffer(encmethods) : "no",
status);
} else {
ast_cli(fd, FORMAT, name,
peer->addr.sin_addr.s_addr ? ast_inet_ntoa(peer->addr.sin_addr) : "(Unspecified)",
- ast_test_flag(peer, IAX_DYNAMIC) ? "(D)" : "(S)",
+ ast_test_flag64(peer, IAX_DYNAMIC) ? "(D)" : "(S)",
nm,
ntohs(peer->addr.sin_port),
- ast_test_flag(peer, IAX_TRUNK) ? "(T)" : " ",
+ ast_test_flag64(peer, IAX_TRUNK) ? "(T)" : " ",
peer->encmethods ? "(E)" : " ",
status,
term);
@@ -5792,8 +5789,8 @@
ast_copy_string(nm, ast_inet_ntoa(peer->mask), sizeof(nm));
astman_append(s, "Mask: %s\r\n", nm);
astman_append(s, "Port: %d\r\n", ntohs(peer->addr.sin_port));
- astman_append(s, "Dynamic: %s\r\n", ast_test_flag(peer, IAX_DYNAMIC) ? "Yes" : "No");
- astman_append(s, "Trunk: %s\r\n", ast_test_flag(peer, IAX_TRUNK) ? "Yes" : "No");
+ astman_append(s, "Dynamic: %s\r\n", ast_test_flag64(peer, IAX_DYNAMIC) ? "Yes" : "No");
+ astman_append(s, "Trunk: %s\r\n", ast_test_flag64(peer, IAX_TRUNK) ? "Yes" : "No");
astman_append(s, "Encryption: %s\r\n", peer->encmethods ? ast_str_buffer(encmethods) : "No");
peer_status(peer, status, sizeof(status));
astman_append(s, "Status: %s\r\n\r\n", status);
@@ -5946,7 +5943,7 @@
if (iaxs[x]) {
int lag, jitter, localdelay;
jb_info jbinfo;
- if (ast_test_flag(iaxs[x], IAX_USEJITTERBUF)) {
+ if (ast_test_flag64(iaxs[x], IAX_USEJITTERBUF)) {
jb_getinfo(iaxs[x]->jb, &jbinfo);
jitter = jbinfo.jitter;
localdelay = jbinfo.current - jbinfo.min;
@@ -5999,7 +5996,7 @@
iax_frame_subclass2str(iaxs[x]->first_iax_message & ~MARK_IAX_SUBCLASS_TX, first_message, sizeof(first_message));
iax_frame_subclass2str(iaxs[x]->last_iax_message & ~MARK_IAX_SUBCLASS_TX, last_message, sizeof(last_message));
- if(ast_test_flag(iaxs[x], IAX_USEJITTERBUF)) {
+ if(ast_test_flag64(iaxs[x], IAX_USEJITTERBUF)) {
jb_getinfo(iaxs[x]->jb, &jbinfo);
localjitter = jbinfo.jitter;
localdelay = jbinfo.current - jbinfo.min;
@@ -6199,12 +6196,12 @@
if (iaxs[callno]) {
/* If there's an outstanding error, return failure now */
if (!iaxs[callno]->error) {
- if (ast_test_flag(iaxs[callno], IAX_ALREADYGONE))
+ if (ast_test_flag64(iaxs[callno], IAX_ALREADYGONE))
res = 0;
/* Don't waste bandwidth sending null frames */
else if (f->frametype == AST_FRAME_NULL)
res = 0;
- else if ((f->frametype == AST_FRAME_VOICE) && ast_test_flag(iaxs[callno], IAX_QUELCH))
+ else if ((f->frametype == AST_FRAME_VOICE) && ast_test_flag64(iaxs[callno], IAX_QUELCH))
res = 0;
else if (!ast_test_flag(&iaxs[callno]->state, IAX_STATE_STARTED))
res = 0;
@@ -6425,15 +6422,15 @@
}
/* If a max AUTHREQ restriction is in place, activate it */
if (user->maxauthreq > 0)
- ast_set_flag(iaxs[callno], IAX_MAXAUTHREQ);
+ ast_set_flag64(iaxs[callno], IAX_MAXAUTHREQ);
iaxs[callno]->prefs = user->prefs;
- ast_copy_flags(iaxs[callno], user, IAX_CODEC_USER_FIRST | IAX_IMMEDIATE | IAX_CODEC_NOPREFS | IAX_CODEC_NOCAP | IAX_FORCE_ENCRYPT);
+ ast_copy_flags64(iaxs[callno], user, IAX_CODEC_USER_FIRST | IAX_IMMEDIATE | IAX_CODEC_NOPREFS | IAX_CODEC_NOCAP | IAX_FORCE_ENCRYPT);
iaxs[callno]->encmethods = user->encmethods;
/* Store the requested username if not specified */
if (ast_strlen_zero(iaxs[callno]->username))
ast_string_field_set(iaxs[callno], username, user->name);
/* Store whether this is a trunked call, too, of course, and move if appropriate */
- ast_copy_flags(iaxs[callno], user, IAX_TRUNK);
+ ast_copy_flags64(iaxs[callno], user, IAX_TRUNK);
iaxs[callno]->capability = user->capability;
/* And use the default context */
if (ast_strlen_zero(iaxs[callno]->context)) {
@@ -6448,7 +6445,7 @@
iaxs[callno]->authmethods = user->authmethods;
iaxs[callno]->adsi = user->adsi;
/* If the user has callerid, override the remote caller id. */
- if (ast_test_flag(user, IAX_HASCALLERID)) {
+ if (ast_test_flag64(user, IAX_HASCALLERID)) {
iaxs[callno]->calling_tns = 0;
iaxs[callno]->calling_ton = 0;
ast_string_field_set(iaxs[callno], cid_num, user->cid_num);
@@ -6470,7 +6467,7 @@
iaxs[callno]->amaflags = user->amaflags;
if (!ast_strlen_zero(user->language))
ast_string_field_set(iaxs[callno], language, user->language);
- ast_copy_flags(iaxs[callno], user, IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE);
+ ast_copy_flags64(iaxs[callno], user, IAX_NOTRANSFER | IAX_TRANSFERMEDIA | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF | IAX_SENDCONNECTEDLINE | IAX_RECVCONNECTEDLINE);
/* Keep this check last */
if (!ast_strlen_zero(user->dbsecret)) {
char *family, *key=NULL;
@@ -6502,7 +6499,7 @@
res = 0;
}
}
- ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK);
+ ast_set2_flag64(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK);
return res;
}
@@ -6556,7 +6553,7 @@
memset(&ied, 0, sizeof(ied));
/* If an AUTHREQ restriction is in place, make sure we can send an AUTHREQ back */
- if (ast_test_flag(p, IAX_MAXAUTHREQ)) {
+ if (ast_test_flag64(p, IAX_MAXAUTHREQ)) {
struct iax2_user *user, tmp_user = {
.name = p->username,
};
@@ -6594,7 +6591,7 @@
res = send_command(p, AST_FRAME_IAX, IAX_COMMAND_AUTHREQ, 0, ied.buf, ied.pos, -1);
if (p->encmethods)
- ast_set_flag(p, IAX_ENCRYPTED);
+ ast_set_flag64(p, IAX_ENCRYPTED);
return res;
}
@@ -6616,14 +6613,14 @@
}
user = ao2_find(users, &tmp_user, OBJ_POINTER);
if (user) {
- if (ast_test_flag(p, IAX_MAXAUTHREQ)) {
+ if (ast_test_flag64(p, IAX_MAXAUTHREQ)) {
ast_atomic_fetchadd_int(&user->curauthreq, -1);
- ast_clear_flag(p, IAX_MAXAUTHREQ);
+ ast_clear_flag64(p, IAX_MAXAUTHREQ);
}
ast_string_field_set(p, host, user->name);
user = user_unref(user);
}
- if (ast_test_flag(p, IAX_FORCE_ENCRYPT) && !p->encmethods) {
+ if (ast_test_flag64(p, IAX_FORCE_ENCRYPT) && !p->encmethods) {
ast_log(LOG_NOTICE, "Call Terminated, Incomming call is unencrypted while force encrypt is enabled.");
return res;
}
@@ -6741,7 +6738,7 @@
goto return_unref;
}
- if (!ast_test_flag(p, IAX_DYNAMIC)) {
+ if (!ast_test_flag64(p, IAX_DYNAMIC)) {
if (authdebug)
ast_log(LOG_NOTICE, "Peer '%s' is not dynamic (from %s)\n", peer, ast_inet_ntoa(sin->sin_addr));
goto return_unref;
@@ -6963,8 +6960,8 @@
}
if (ies->encmethods) {
- ast_set_flag(p, IAX_ENCRYPTED | IAX_KEYPOPULATED);
- } else if (ast_test_flag(iaxs[callno], IAX_FORCE_ENCRYPT)) {
+ ast_set_flag64(p, IAX_ENCRYPTED | IAX_KEYPOPULATED);
+ } else if (ast_test_flag64(iaxs[callno], IAX_FORCE_ENCRYPT)) {
ast_log(LOG_NOTICE, "Call initiated without encryption while forceencryption=yes option is set");
return -1; /* if force encryption is yes, and no encryption methods, then return -1 to hangup */
}
@@ -7333,21 +7330,21 @@
peer->expire = -1;
ast_debug(1, "Expiring registration for peer '%s'\n", peer->name);
- if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(peer, IAX_TEMPONLY|IAX_RTCACHEFRIENDS)))
+ if (ast_test_flag64((&globalflags), IAX_RTUPDATE) && (ast_test_flag64(peer, IAX_TEMPONLY|IAX_RTCACHEFRIENDS)))
realtime_update_peer(peer->name, &peer->addr, 0);
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Unregistered\r\nCause: Expired\r\n", peer->name);
/* Reset the address */
memset(&peer->addr, 0, sizeof(peer->addr));
/* Reset expiry value */
peer->expiry = min_reg_expire;
- if (!ast_test_flag(peer, IAX_TEMPONLY))
+ if (!ast_test_flag64(peer, IAX_TEMPONLY))
ast_db_del("IAX/Registry", peer->name);
register_peer_exten(peer, 0);
ast_devstate_changed(AST_DEVICE_UNAVAILABLE, "IAX2/%s", peer->name); /* Activate notification */
if (iax2_regfunk)
iax2_regfunk(peer->name, 0);
- if (ast_test_flag(peer, IAX_RTAUTOCLEAR))
+ if (ast_test_flag64(peer, IAX_RTAUTOCLEAR))
unlink_peer(peer);
peer_unref(peer);
@@ -7369,7 +7366,7 @@
char data[80];
struct in_addr in;
char *c, *d;
- if (!ast_test_flag(p, IAX_TEMPONLY) && (!ast_db_get("IAX/Registry", p->name, data, sizeof(data)))) {
+ if (!ast_test_flag64(p, IAX_TEMPONLY) && (!ast_db_get("IAX/Registry", p->name, data, sizeof(data)))) {
c = strchr(data, ':');
if (c) {
*c = '\0';
@@ -7439,7 +7436,7 @@
if (!iaxs[callno])
goto return_unref;
- if (ast_test_flag((&globalflags), IAX_RTUPDATE) && (ast_test_flag(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) {
+ if (ast_test_flag64((&globalflags), IAX_RTUPDATE) && (ast_test_flag64(p, IAX_TEMPONLY|IAX_RTCACHEFRIENDS))) {
if (sin->sin_addr.s_addr) {
time_t nowtime;
time(&nowtime);
@@ -7454,14 +7451,14 @@
/* Stash the IP address from which they registered */
memcpy(&p->addr, sin, sizeof(p->addr));
snprintf(data, sizeof(data), "%s:%d:%d", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port), p->expiry);
- if (!ast_test_flag(p, IAX_TEMPONLY) && sin->sin_addr.s_addr) {
+ if (!ast_test_flag64(p, IAX_TEMPONLY) && sin->sin_addr.s_addr) {
ast_db_put("IAX/Registry", p->name, data);
ast_verb(3, "Registered IAX2 '%s' (%s) at %s:%d\n", p->name,
ast_test_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED) ? "AUTHENTICATED" : "UNAUTHENTICATED", ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port));
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Registered\r\n", p->name);
register_peer_exten(p, 1);
ast_devstate_changed(AST_DEVICE_UNKNOWN, "IAX2/%s", p->name); /* Activate notification */
- } else if (!ast_test_flag(p, IAX_TEMPONLY)) {
+ } else if (!ast_test_flag64(p, IAX_TEMPONLY)) {
ast_verb(3, "Unregistered IAX2 '%s' (%s)\n", p->name,
ast_test_flag(&iaxs[callno]->state, IAX_STATE_AUTHENTICATED) ? "AUTHENTICATED" : "UNAUTHENTICATED");
manager_event(EVENT_FLAG_SYSTEM, "PeerStatus", "ChannelType: IAX2\r\nPeer: IAX2/%s\r\nPeerStatus: Unregistered\r\n", p->name);
@@ -7545,7 +7542,7 @@
iax_ie_append_short(&ied, IAX_IE_MSGCOUNT, msgcount);
}
- if (ast_test_flag(p, IAX_HASCALLERID)) {
+ if (ast_test_flag64(p, IAX_HASCALLERID)) {
iax_ie_append_str(&ied, IAX_IE_CALLING_NUMBER, p->cid_num);
iax_ie_append_str(&ied, IAX_IE_CALLING_NAME, p->cid_name);
}
@@ -7806,7 +7803,7 @@
/* We're actually sending a frame, so fill the meta trunk header and meta header */
meta->zeros = 0;
meta->metacmd = IAX_META_TRUNK;
- if (ast_test_flag(&globalflags, IAX_TRUNKTIMESTAMPS))
+ if (ast_test_flag64(&globalflags, IAX_TRUNKTIMESTAMPS))
meta->cmddata = IAX_META_TRUNK_MINI;
else
meta->cmddata = IAX_META_TRUNK_SUPERMINI;
@@ -8121,7 +8118,7 @@
ast_mutex_lock(&iaxsl[callno]);
if (iaxs[callno] && iaxs[callno]->owner && iaxs[callno]->owner->name) {
- if(ast_test_flag(iaxs[callno], IAX_USEJITTERBUF)) {
+ if(ast_test_flag64(iaxs[callno], IAX_USEJITTERBUF)) {
jb_getinfo(iaxs[callno]->jb, &jbinfo);
localjitter = jbinfo.jitter;
localdelay = jbinfo.current - jbinfo.min;
@@ -8646,7 +8643,7 @@
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
- if (ast_test_flag(iaxs[fr->callno], IAX_ENCRYPTED)) {
+ if (ast_test_flag64(iaxs[fr->callno], IAX_ENCRYPTED)) {
if (decrypt_frame(fr->callno, fh, &f, &res)) {
ast_log(LOG_NOTICE, "Packet Decrypt Failed!\n");
[... 853 lines stripped ...]
More information about the svn-commits
mailing list