#define HTTP_DEFAULT_SERV "80"
/** HTTP protocol identifier */
+#ifndef _MSC_VER
#define HTTP_PROTOCOL_TAG ((void *)0x48545450) /* 'HTTP' */
+#else
+#define HTTP_PROTOCOL_TAG ((void *)(UINT_PTR)0x48545450) /* 'HTTP' */
+#endif
/** HTTP parser flags */
enum {
#include <sofia-sip/su_tagarg.h>
#include "sofia-sip/msg_tag_class.h"
+#ifndef _MSC_VER
#define NONE ((void*)-1)
+#else
+#define NONE ((void*)(UINT_PTR)-1)
+#endif
int msghdrtag_snprintf(tagi_t const *t, char b[], size_t size)
{
(h))
/** No header. */
+
+#ifndef _MSC_VER
#define MSG_HEADER_NONE ((msg_header_t *)-1)
+#else
+#define MSG_HEADER_NONE ((msg_header_t *)(UINT_PTR)-1)
+#endif
SOFIA_END_DECLS
SOFIAPUBVAR char const msg_mime_version_1_0[];
/** MIME multipart parser table identifier. @HIDE */
+#ifndef _MSC_VER
#define MSG_MULTIPART_PROTOCOL_TAG ((void *)0x4d494d45) /* 'MIME' */
+#else
+#define MSG_MULTIPART_PROTOCOL_TAG ((void *)(UINT_PTR)0x4d494d45) /* 'MIME' */
+#endif
SOFIA_END_DECLS
#include "nea_debug.h"
+#ifndef _MSC_VER
#define NONE ((void *)- 1)
+#else
+#define NONE ((void *)(UINT_PTR)- 1)
+#endif
#define SU_ROOT_MAGIC_T struct nea_server_s
#define SU_MSG_ARG_T tagi_t
static char const __func__[] = "nta";
#endif
+#ifndef _MSC_VER
#define NONE ((void *)-1)
-
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
/* ------------------------------------------------------------------------- */
/** Resolving order */
#include <sofia-sip/su_debug.h>
#ifndef NONE
+
+#ifndef _MSC_VER
#define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
#endif
/* ======================================================================== */
nua_event_data_t ee_data[1];
} nua_ee_data_t;
+#ifndef _MSC_VER
#define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
typedef struct register_usage nua_registration_t;
#define SIP_METHOD_PUBLISH sip_method_publish, "PUBLISH"
/** Magic pointer value - never valid for SIP headers. @HI */
+#ifndef _MSC_VER
#define SIP_NONE ((void const *)-1L)
+#else
+#define SIP_NONE ((void const *)(UINT_PTR)-1L)
+#endif
/** SIP protocol identifier @HIDE */
+#ifndef _MSC_VER
#define SIP_PROTOCOL_TAG ((void *)0x53495020) /* 'SIP'20 */
+#else
+#define SIP_PROTOCOL_TAG ((void *)(UINT_PTR)0x53495020) /* 'SIP'20 */
+#endif
enum {
/** Default port for SIP as integer */
#include <sofia-sip/su_string.h>
#include <sofia-sip/su_errno.h>
+#ifndef _MSC_VER
#define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
#define XXX assert(!"implemented")
typedef unsigned longlong ull;
return NULL;
}
+#ifndef _MSC_VER
#define SDP_MEDIA_NONE ((sdp_media_t *)-1)
+#else
+#define SDP_MEDIA_NONE ((sdp_media_t *)(UINT_PTR)-1)
+#endif
/** Find first matching media in table @a mm.
*
ssize_t sres_recvfrom(sres_socket_t s, void *buffer, size_t length, int flags,
struct sockaddr *from, socklen_t *fromlen)
{
- int retval, ilen;
+ int retval, ilen = 0;
if (fromlen)
ilen = *fromlen;
ssize_t su_recvfrom(su_socket_t s, void *buffer, size_t length, int flags,
su_sockaddr_t *from, socklen_t *fromlen)
{
- int retval, ilen;
+ int retval, ilen = 0;
if (fromlen)
ilen = *fromlen;
#endif
#ifndef NONE
+#ifndef _MSC_VER
#define NONE ((void *)-1)
+#else
+#define NONE ((void *)(UINT_PTR)-1)
+#endif
#endif
SOFIA_BEGIN_DECLS
const char *T38FaxUdpEC;
const char *T38VendorInfo;
const char *remote_ip;
- uint32_t remote_port;
+ uint16_t remote_port;
const char *local_ip;
- uint32_t local_port;
+ uint16_t local_port;
} switch_t38_options_t;
/*!
int len = 0;
if (!zstr(cmd)) {
- len = (strlen(cmd) * 3) + 1;
+ len = (int)(strlen(cmd) * 3) + 1;
switch_zmalloc(data, len);
switch_url_encode(cmd, data, len);
reply = data;
return SWITCH_STATUS_SUCCESS;
}
- len = strlen(cmd) * 2;
+ len = (int)strlen(cmd) * 2;
mycmd = malloc(len);
stream->write_function(stream, "%s", switch_escape_string(cmd, mycmd, len));
uint8_t *file_frame;
uint8_t *async_file_frame;
int16_t *bptr;
- int x = 0;
+ uint32_t x = 0;
int32_t z = 0;
int member_score_sum = 0;
int divisor = 0;
profile_set_config(profile);
/* Add the params to the event structure */
- count = switch_event_import_xml(switch_xml_child(x_profile, "param"), "name", "value", &event);
+ count = (int)switch_event_import_xml(switch_xml_child(x_profile, "param"), "name", "value", &event);
if (switch_xml_config_parse_event(event, count, SWITCH_FALSE, profile->config) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to process configuration\n");
}
if (strlen(cbr->digits) < sizeof(cbr->digits) - 2) {
- int at = strlen(cbr->digits);
+ int at = (int)strlen(cbr->digits);
cbr->digits[at++] = dtmf->digit;
cbr->digits[at] = '\0';
} else {
if (match_key(caller_exit_key, *buf)) {
cd->abort = 1;
return SWITCH_STATUS_FALSE;
- switch_channel_set_variable(channel, "fifo_caller_exit_key", (char *)buf);
}
cd->next = switch_epoch_time_now(NULL) + cd->freq;
cd->index++;
const char *username = switch_xml_attr(x_list, "username");
const char *password = switch_xml_attr(x_list, "password");
const char *szinterval = switch_xml_attr(x_list, "interval");
- int port = 0, interval = 0;
+ uint16_t port = 0;
+ int interval = 0;
limit_remote_t *remote;
switch_threadattr_t *thd_attr = NULL;
}
if (!zstr(szport)) {
- port = atoi(szport);
+ port = (uint16_t)atoi(szport);
}
if (!zstr(szinterval)) {
/* Kill remote connections, destroy needs a wrlock so we unlock after finding a pointer */
while(remote_clean) {
void *val;
- const void *key;
+ const void *key = NULL;
switch_ssize_t keylen;
limit_remote_t *item = NULL;
switch_channel_t *channel = NULL;
if (!zstr(cid)) {
- len = strlen(cid);
+ len = (uint32_t)strlen(cid);
} else {
goto done;
}
int digit_len;
SWITCH_STANDARD_STREAM(dig_stream);
- digit_len = strlen(digits);
+ digit_len = (int)strlen(digits);
digits_copy = switch_core_strdup(pool, digits);
for (n = digit_len; n > 0; n--) {
billaccount = switch_channel_get_variable(channel, "nibble_account");
if (!zstr(switch_channel_get_variable(channel, "nobal_amt"))) {
- nobal_amt = atof(switch_channel_get_variable(channel, "nobal_amt"));
+ nobal_amt = (float)atof(switch_channel_get_variable(channel, "nobal_amt"));
}
if (!zstr(switch_channel_get_variable(channel, "lowbal_amt"))) {
- lowbal_amt = atof(switch_channel_get_variable(channel, "lowbal_amt"));
+ lowbal_amt = (float)atof(switch_channel_get_variable(channel, "lowbal_amt"));
}
/* Return if there's no billing information on this session */
if (value < 0x80) {
/* 1 octet */
- buf[(*len)++] = value;
+ buf[(*len)++] = (uint8_t)value;
return value;
}
if (value < 0x4000) {
/* Fragmentation */
multiplier = (value < 0x10000) ? (value >> 14) : 4;
/* Set the first 2 bits of the octet */
- buf[(*len)++] = 0xC0 | multiplier;
+ buf[(*len)++] = (uint8_t) (0xC0 | multiplier);
return multiplier << 14;
}
/* Span is defined as an inconstrained integer, which it dumb. It will only
ever be a small value. Treat it as such. */
buf[len++] = 1;
- buf[len++] = span;
+ buf[len++] = (uint8_t)span;
/* The number of entries is defined as a length, but will only ever be a small
value. Treat it as such. */
- buf[len++] = entries;
+ buf[len++] = (uint8_t)entries;
for (m = 0; m < entries; m++) {
/* Make an XOR'ed entry the maximum length */
limit = (entry + m) & UDPTL_BUF_MASK;
switch_time_t etime = atoi(argv[6]);
switch_size_t retsize;
- exp_secs = etime - now;
+ exp_secs = (int)(etime - now);
switch_time_exp_lt(&tm, switch_time_from_sec(etime));
switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
}
switch_time_t etime = atoi(argv[6]);
switch_size_t retsize;
- exp_secs = etime - now;
+ exp_secs = (int)(etime - now);
switch_time_exp_lt(&tm, switch_time_from_sec(etime));
switch_strftime_nocheck(exp_buf, &retsize, sizeof(exp_buf), "%Y-%m-%d %T", &tm);
}
} else if (!strcasecmp(argv[0], "profile")) {
struct cb_helper cb;
char *sql = NULL;
- int x = 0;
+ uint32_t x = 0;
cb.row_process = 0;
} else if (!strcasecmp(argv[0], "profile")) {
struct cb_helper cb;
char *sql = NULL;
- int x = 0;
+ uint32_t x = 0;
cb.row_process = 0;
switch_mutex_lock(mod_sofia_globals.hash_mutex);
if (mod_sofia_globals.profile_hash) {
for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) {
- int rb = 0, x = 0;
+ int rb = 0;
+ uint32_t x = 0;
switch_hash_this(hi, &var, NULL, &val);
if ((profile = (sofia_profile_t *) val) && profile->auto_restart) {
if (!strcmp(profile->sipip, old_ip4)) {
char const *tport2 = NULL;
sres_record_t **answers1 = NULL, **answers2 = NULL;
unsigned count1 = 0, count2 = 0, tcount = 0;
- int type1 = 0, type2 = 0, family1 = 0, family2 = 0;
+ uint16_t type1 = 0, type2 = 0, family1 = 0, family2 = 0;
if (dig->ip6 > dig->ip4) {
type1 = sres_type_aaaa, family1 = AF_INET6;
iterations++;
if (len + newlen + 10 > sql_len) {
- int new_mlen = len + newlen + 10 + 10240;
+ switch_size_t new_mlen = len + newlen + 10 + 10240;
if (new_mlen < SQLLEN) {
sql_len = new_mlen;
switch_port_t remote_rtcp_port = 0;
if ((rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_video_rtcp_port"))) {
- remote_rtcp_port = atoi(rport);
+ remote_rtcp_port = (switch_port_t)atoi(rport);
}
}
if ((rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_audio_rtcp_port"))) {
- remote_rtcp_port = atoi(rport);
+ remote_rtcp_port = (switch_port_t)atoi(rport);
}
sofia_clear_flag_locked(tech_pvt, TFLAG_REINVITE);
if ((rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_audio_rtcp_port"))) {
- remote_rtcp_port = atoi(rport);
+ remote_rtcp_port = (switch_port_t)atoi(rport);
}
if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port,
const char *rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_audio_rtcp_port");
switch_port_t remote_port = 0;
if (rport) {
- remote_port = atoi(rport);
+ remote_port = (switch_port_t)atoi(rport);
}
if (!strcasecmp(val, "passthru")) {
switch_rtp_activate_rtcp(tech_pvt->rtp_session, -1, remote_port);
sofia_clear_flag_locked(tech_pvt, TFLAG_REINVITE);
if ((rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_video_rtcp_port"))) {
- remote_rtcp_port = atoi(rport);
+ remote_rtcp_port = (switch_port_t)atoi(rport);
}
if (switch_rtp_set_remote_address
const char *rport = switch_channel_get_variable(tech_pvt->channel, "sip_remote_video_rtcp_port");
switch_port_t remote_port = 0;
if (rport) {
- remote_port = atoi(rport);
+ remote_port = (switch_port_t)atoi(rport);
}
if (!strcasecmp(val, "passthru")) {
switch_rtp_activate_rtcp(tech_pvt->rtp_session, -1, remote_port);
t38_options = switch_core_session_alloc(tech_pvt->session, sizeof(switch_t38_options_t));
}
- t38_options->remote_port = m->m_port;
+ t38_options->remote_port = (switch_port_t)m->m_port;
if (m->m_connections && m->m_connections->c_address) {
t38_options->remote_ip = switch_core_session_strdup(tech_pvt->session, m->m_connections->c_address);
}
if ((tmp = switch_channel_get_variable(channel, "sip_use_pt"))) {
- tech_pvt->pt = tech_pvt->agreed_pt = atoi(tmp);
+ tech_pvt->pt = tech_pvt->agreed_pt = (switch_payload_t)atoi(tmp);
}
sofia_glue_tech_set_codec(tech_pvt, 1);
tech_pvt->adv_sdp_audio_ip = tech_pvt->extrtpip = (char *) ip;
- tech_pvt->adv_sdp_audio_port = tech_pvt->local_sdp_audio_port = atoi(port);
+ tech_pvt->adv_sdp_audio_port = tech_pvt->local_sdp_audio_port = (switch_port_t)atoi(port);
if ((tmp = switch_channel_get_variable(channel, "local_media_ip"))) {
tech_pvt->local_sdp_audio_ip = switch_core_session_strdup(session, tmp);
if (r_ip && r_port) {
tech_pvt->remote_sdp_audio_ip = (char *) r_ip;
- tech_pvt->remote_sdp_audio_port = atoi(r_port);
+ tech_pvt->remote_sdp_audio_port = (switch_port_t)atoi(r_port);
}
if (switch_channel_test_flag(channel, CF_VIDEO)) {
if ((tmp = switch_channel_get_variable(channel, "sip_use_video_pt"))) {
- tech_pvt->video_pt = tech_pvt->video_agreed_pt = atoi(tmp);
+ tech_pvt->video_pt = tech_pvt->video_agreed_pt = (switch_payload_t)atoi(tmp);
}
tech_pvt->video_codec_ms = atoi(tmp);
}
- tech_pvt->adv_sdp_video_port = tech_pvt->local_sdp_video_port = atoi(port);
+ tech_pvt->adv_sdp_video_port = tech_pvt->local_sdp_video_port = (switch_port_t)atoi(port);
if (r_ip && r_port) {
tech_pvt->remote_sdp_video_ip = (char *) r_ip;
- tech_pvt->remote_sdp_video_port = atoi(r_port);
+ tech_pvt->remote_sdp_video_port = (switch_port_t)atoi(r_port);
}
//sofia_glue_tech_set_video_codec(tech_pvt, 1);
}
if (sip->sip_path) {
path_val = sip_header_as_string(nua_handle_home(nh), (void *) sip->sip_path);
- path_encoded_len = (strlen(path_val) * 3) + 1;
+ path_encoded_len = (int)(strlen(path_val) * 3) + 1;
switch_zmalloc(path_encoded, path_encoded_len);
switch_copy_string(path_encoded, ";fs_path=", 10);
switch_url_encode(path_val, path_encoded + 9, path_encoded_len - 9);
switch_snprintf(my_contact_str, sizeof(my_contact_str), "sip:%s@%s:%d", contact->m_url->url_user, url_ip, network_port);
}
- path_encoded_len = (strlen(my_contact_str) * 3) + 1;
+ path_encoded_len = (int)(strlen(my_contact_str) * 3) + 1;
switch_zmalloc(path_encoded, path_encoded_len);
switch_copy_string(path_encoded, ";fs_path=", 10);
if (auth_acl) {
if (!switch_check_network_list_ip(ip, auth_acl)) {
- int network_ip_is_proxy = 0, x = 0;
+ int network_ip_is_proxy = 0;
+ uint32_t x = 0;
char *last_acl = NULL;
if (profile->proxy_acl_count == 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by user acl [%s] and no proxy acl present\n", ip, auth_acl);
if (max_registrations_perext > 0 && (sip && sip->sip_contact && (sip->sip_contact->m_expires == NULL || atol(sip->sip_contact->m_expires) > 0))) {
/* if expires is null still process */
/* expires == 0 means the phone is going to unregiser, so don't count against max */
- int count = 0;
+ uint32_t count = 0;
call_id = sip->sip_call_id->i_id;
switch_assert(call_id);
}\r
\r
\r
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_set(void * jarg1, unsigned long jarg2) {\r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_set(void * jarg1, unsigned short jarg2) {\r
switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;\r
- uint32_t arg2 ;\r
+ uint16_t arg2 ;\r
\r
arg1 = (switch_t38_options_t *)jarg1; \r
- arg2 = (uint32_t)jarg2; \r
+ arg2 = (uint16_t)jarg2; \r
if (arg1) (arg1)->remote_port = arg2;\r
}\r
\r
\r
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_get(void * jarg1) {\r
- unsigned long jresult ;\r
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_remote_port_get(void * jarg1) {\r
+ unsigned short jresult ;\r
switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;\r
- uint32_t result;\r
+ uint16_t result;\r
\r
arg1 = (switch_t38_options_t *)jarg1; \r
- result = (uint32_t) ((arg1)->remote_port);\r
- jresult = (unsigned long)result; \r
+ result = (uint16_t) ((arg1)->remote_port);\r
+ jresult = result; \r
return jresult;\r
}\r
\r
}\r
\r
\r
-SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_port_set(void * jarg1, unsigned long jarg2) {\r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_t38_options_t_local_port_set(void * jarg1, unsigned short jarg2) {\r
switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;\r
- uint32_t arg2 ;\r
+ uint16_t arg2 ;\r
\r
arg1 = (switch_t38_options_t *)jarg1; \r
- arg2 = (uint32_t)jarg2; \r
+ arg2 = (uint16_t)jarg2; \r
if (arg1) (arg1)->local_port = arg2;\r
}\r
\r
\r
-SWIGEXPORT unsigned long SWIGSTDCALL CSharp_switch_t38_options_t_local_port_get(void * jarg1) {\r
- unsigned long jresult ;\r
+SWIGEXPORT unsigned short SWIGSTDCALL CSharp_switch_t38_options_t_local_port_get(void * jarg1) {\r
+ unsigned short jresult ;\r
switch_t38_options_t *arg1 = (switch_t38_options_t *) 0 ;\r
- uint32_t result;\r
+ uint16_t result;\r
\r
arg1 = (switch_t38_options_t *)jarg1; \r
- result = (uint32_t) ((arg1)->local_port);\r
- jresult = (unsigned long)result; \r
+ result = (uint16_t) ((arg1)->local_port);\r
+ jresult = result; \r
return jresult;\r
}\r
\r
public static extern string switch_t38_options_t_remote_ip_get(HandleRef jarg1);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_remote_port_set")]\r
- public static extern void switch_t38_options_t_remote_port_set(HandleRef jarg1, uint jarg2);\r
+ public static extern void switch_t38_options_t_remote_port_set(HandleRef jarg1, ushort jarg2);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_remote_port_get")]\r
- public static extern uint switch_t38_options_t_remote_port_get(HandleRef jarg1);\r
+ public static extern ushort switch_t38_options_t_remote_port_get(HandleRef jarg1);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_local_ip_set")]\r
public static extern void switch_t38_options_t_local_ip_set(HandleRef jarg1, string jarg2);\r
public static extern string switch_t38_options_t_local_ip_get(HandleRef jarg1);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_local_port_set")]\r
- public static extern void switch_t38_options_t_local_port_set(HandleRef jarg1, uint jarg2);\r
+ public static extern void switch_t38_options_t_local_port_set(HandleRef jarg1, ushort jarg2);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_switch_t38_options_t_local_port_get")]\r
- public static extern uint switch_t38_options_t_local_port_get(HandleRef jarg1);\r
+ public static extern ushort switch_t38_options_t_local_port_get(HandleRef jarg1);\r
\r
[DllImport("mod_managed", EntryPoint="CSharp_new_switch_t38_options_t")]\r
public static extern IntPtr new_switch_t38_options_t();\r
} \r
}\r
\r
- public uint remote_port {\r
+ public ushort remote_port {\r
set {\r
freeswitchPINVOKE.switch_t38_options_t_remote_port_set(swigCPtr, value);\r
} \r
get {\r
- uint ret = freeswitchPINVOKE.switch_t38_options_t_remote_port_get(swigCPtr);\r
+ ushort ret = freeswitchPINVOKE.switch_t38_options_t_remote_port_get(swigCPtr);\r
return ret;\r
} \r
}\r
} \r
}\r
\r
- public uint local_port {\r
+ public ushort local_port {\r
set {\r
freeswitchPINVOKE.switch_t38_options_t_local_port_set(swigCPtr, value);\r
} \r
get {\r
- uint ret = freeswitchPINVOKE.switch_t38_options_t_local_port_get(swigCPtr);\r
+ ushort ret = freeswitchPINVOKE.switch_t38_options_t_local_port_get(swigCPtr);\r
return ret;\r
} \r
}\r
projects / thirdparty / freeswitch.git / commitdiff
