forked from Mirrors/freeswitch
Compare commits
12 Commits
Author | SHA1 | Date |
---|---|---|
Andrey Volk | e8f6102685 | |
Andrey Volk | 4f48835575 | |
Andrey Volk | 13fe1da46a | |
Andrey Volk | 87b00566ef | |
Andrey Volk | 116630d0a2 | |
Andrey Volk | 86951fa817 | |
Andrey Volk | bc5067d94e | |
Andrey Volk | 2c90b6505e | |
Andrey Volk | ac4b1ecb66 | |
Andrey Volk | a24c077809 | |
Andrey Volk | 27bb52c0b5 | |
Andrey Volk | 7d6082c349 |
|
@ -113,7 +113,7 @@ static int db_is_up(switch_pgsql_handle_t *handle)
|
|||
char *err_str = NULL;
|
||||
int max_tries = DEFAULT_PGSQL_RETRIES;
|
||||
int code = 0;
|
||||
int recon = 0;
|
||||
switch_status_t recon = SWITCH_STATUS_FALSE;
|
||||
switch_byte_t sanity = 255;
|
||||
|
||||
if (handle) {
|
||||
|
|
|
@ -2066,13 +2066,13 @@ SWITCH_DECLARE(switch_status_t) switch_media_handle_create(switch_media_handle_t
|
|||
switch_mutex_init(&session->media_handle->control_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
|
||||
|
||||
session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].ssrc =
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO] + (uint32_t) time(NULL));
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO] + (intptr_t) time(NULL));
|
||||
|
||||
session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].ssrc =
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO] + (uint32_t) time(NULL) / 2);
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO] + (intptr_t) time(NULL) / 2);
|
||||
|
||||
session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT].ssrc =
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT] + (uint32_t) time(NULL) / 2);
|
||||
(uint32_t) ((intptr_t) &session->media_handle->engines[SWITCH_MEDIA_TYPE_TEXT] + (intptr_t) time(NULL) / 2);
|
||||
|
||||
|
||||
|
||||
|
@ -10526,7 +10526,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
|
|||
}
|
||||
|
||||
if (!smh->owner_id) {
|
||||
smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) - port;
|
||||
smh->owner_id = (uint32_t)(intptr_t)switch_epoch_time_now(NULL) - port;
|
||||
}
|
||||
|
||||
if (!smh->session_id) {
|
||||
|
@ -11836,7 +11836,7 @@ SWITCH_DECLARE(void) switch_core_media_set_udptl_image_sdp(switch_core_session_t
|
|||
}
|
||||
|
||||
if (!smh->owner_id) {
|
||||
smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) - port;
|
||||
smh->owner_id = (uint32_t)(intptr_t)switch_epoch_time_now(NULL) - port;
|
||||
}
|
||||
|
||||
if (!smh->session_id) {
|
||||
|
@ -12050,7 +12050,7 @@ SWITCH_DECLARE(void) switch_core_media_patch_sdp(switch_core_session_t *session)
|
|||
family = strchr(smh->mparams->sipip, ':') ? "IP6" : "IP4";
|
||||
|
||||
if (!smh->owner_id) {
|
||||
smh->owner_id = (uint32_t) switch_epoch_time_now(NULL) * 31821U + 13849U;
|
||||
smh->owner_id = (uint32_t)(intptr_t)switch_epoch_time_now(NULL) * 31821U + 13849U;
|
||||
}
|
||||
|
||||
if (!smh->session_id) {
|
||||
|
|
|
@ -2814,7 +2814,7 @@ SWITCH_DECLARE(int) switch_ivr_set_xml_call_stats(switch_xml_t xml, switch_core_
|
|||
static int switch_ivr_set_xml_chan_var(switch_xml_t xml, const char *var, const char *val, int off)
|
||||
{
|
||||
char *data;
|
||||
switch_size_t dlen = strlen(val) * 3 + 1;
|
||||
switch_size_t dlen = val ? strlen(val) * 3 + 1 : 1;
|
||||
switch_xml_t variable;
|
||||
|
||||
if (!val) val = "";
|
||||
|
|
|
@ -320,7 +320,7 @@ static int check_per_channel_timeouts(originate_global_t *oglobals,
|
|||
delayed_min = oglobals->originate_status[i].per_channel_delay_start;
|
||||
}
|
||||
}
|
||||
early_exit_time = delayed_min - (uint32_t) elapsed;
|
||||
early_exit_time = delayed_min - (uint32_t)(intptr_t) elapsed;
|
||||
}
|
||||
for (i = 0; i < max; i++) {
|
||||
if (oglobals->originate_status[i].peer_channel && oglobals->originate_status[i].per_channel_delay_start &&
|
||||
|
@ -1305,7 +1305,7 @@ static switch_status_t setup_ringback(originate_global_t *oglobals, originate_st
|
|||
}
|
||||
}
|
||||
|
||||
if (oglobals->session && (read_codec = switch_core_session_get_read_codec(oglobals->session))) {
|
||||
if ((read_codec = switch_core_session_get_read_codec(oglobals->session))) {
|
||||
if (ringback_data && switch_is_file_path(ringback_data)) {
|
||||
if (!(strrchr(ringback_data, '.') || strstr(ringback_data, SWITCH_URL_SEPARATOR))) {
|
||||
ringback->asis++;
|
||||
|
|
|
@ -4325,7 +4325,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session
|
|||
switch_sockaddr_create(&rtp_session->rtcp_from_addr, pool);
|
||||
}
|
||||
rtp_session->seq = (uint16_t) rand();
|
||||
rtp_session->ssrc = (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL));
|
||||
rtp_session->ssrc = (uint32_t) ((intptr_t) rtp_session + (intptr_t) switch_epoch_time_now(NULL));
|
||||
#ifdef DEBUG_TS_ROLLOVER
|
||||
rtp_session->last_write_ts = TS_ROLLOVER_START;
|
||||
#endif
|
||||
|
@ -8061,7 +8061,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session,
|
|||
/* If the marker was set, and the timestamp seems to have started over - set a new SSRC, to indicate this is a new stream */
|
||||
if (m && !switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_SECURE_SEND) && (rtp_session->rtp_bugs & RTP_BUG_CHANGE_SSRC_ON_MARKER) &&
|
||||
(rtp_session->flags[SWITCH_RTP_FLAG_RESET] || (rtp_session->ts <= rtp_session->last_write_ts && rtp_session->last_write_ts > 0))) {
|
||||
switch_rtp_set_ssrc(rtp_session, (uint32_t) ((intptr_t) rtp_session + (uint32_t) switch_epoch_time_now(NULL)));
|
||||
switch_rtp_set_ssrc(rtp_session, (uint32_t) ((intptr_t) rtp_session + (intptr_t) switch_epoch_time_now(NULL)));
|
||||
}
|
||||
|
||||
if (!switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_VIDEO) && !switch_rtp_test_flag(rtp_session, SWITCH_RTP_FLAG_UDPTL)) {
|
||||
|
|
|
@ -768,7 +768,7 @@ SWITCH_DECLARE(int) switch_parse_cidr(const char *string, ip_t *ip, ip_t *mask,
|
|||
if (n >= 8) {
|
||||
maskv->v6.s6_addr[i] = 0xFF;
|
||||
n -= 8;
|
||||
} else if (n < 8) {
|
||||
} else if (n && n < 8) {
|
||||
maskv->v6.s6_addr[i] = 0xFF & ~(0xFF >> n);
|
||||
n -= n;
|
||||
} else if (n == 0) {
|
||||
|
@ -1161,7 +1161,7 @@ SWITCH_DECLARE(switch_bool_t) switch_simple_email(const char *to,
|
|||
switch_safe_free(dupfile);
|
||||
}
|
||||
|
||||
switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int) switch_epoch_time_now(NULL), rand() & 0xffff);
|
||||
switch_snprintf(filename, 80, "%s%smail.%d%04x", SWITCH_GLOBAL_dirs.temp_dir, SWITCH_PATH_SEPARATOR, (int)(intptr_t)switch_epoch_time_now(NULL), rand() & 0xffff);
|
||||
|
||||
if ((fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644)) > -1) {
|
||||
if (file) {
|
||||
|
|
Loading…
Reference in New Issue