return ms;
}
-static unsigned int fix_peerts(struct iax2_trunk_peer *peer, int callno, unsigned int ts)
+static unsigned int fix_peerts(struct timeval *tv, int callno, unsigned int ts)
{
long ms; /* NOT unsigned */
if (!iaxs[callno]->rxcore.tv_sec && !iaxs[callno]->rxcore.tv_usec) {
iaxs[callno]->rxcore.tv_usec -= iaxs[callno]->rxcore.tv_usec % 20000;
}
/* Calculate difference between trunk and channel */
- ms = (peer->rxtrunktime.tv_sec - iaxs[callno]->rxcore.tv_sec) * 1000 +
- (peer->rxtrunktime.tv_usec - iaxs[callno]->rxcore.tv_usec) / 1000;
+ ms = (tv->tv_sec - iaxs[callno]->rxcore.tv_sec) * 1000 +
+ (tv->tv_usec - iaxs[callno]->rxcore.tv_usec) / 1000;
/* Return as the sum of trunk time and the difference between trunk and real time */
return ms + ts;
}
struct iax2_dpcache *dp;
struct iax2_peer *peer;
struct iax2_trunk_peer *tpeer;
+ struct timeval rxtrunktime;
struct iax_ies ies;
struct iax_ie_data ied0, ied1;
int format;
tpeer->trunkact = tpeer->rxtrunktime;
} else
gettimeofday(&tpeer->trunkact, NULL);
+ rxtrunktime = tpeer->rxtrunktime;
+ ast_mutex_unlock(&tpeer->lock);
while(res >= sizeof(struct ast_iax2_meta_trunk_entry)) {
/* Process channels */
mte = (struct ast_iax2_meta_trunk_entry *)ptr;
f.data = ptr;
else
f.data = NULL;
- fr.ts = fix_peerts(tpeer, fr.callno, ts);
+ fr.ts = fix_peerts(&rxtrunktime, fr.callno, ts);
/* Don't pass any packets until we're started */
if ((iaxs[fr.callno]->state & IAX_STATE_STARTED)) {
/* Common things */
ptr += len;
res -= len;
}
- ast_mutex_unlock(&tpeer->lock);
}
return 1;
close(mgcpsock);
if (mgcpsock_read_id != NULL)
- mgcpsock_read_id = ast_io_remove(io, mgcpsock_read_id);
+ ast_io_remove(io, mgcpsock_read_id);
+ mgcpsock_read_id = NULL;
mgcpsock = socket(AF_INET, SOCK_DGRAM, 0);
if (mgcpsock < 0) {