mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-14 01:49:05 +00:00
use more correct const char * for things that should not be modified. This should also fix the switch_cpp.cpp changes from MODAPP-44. More patches to follow up on this for a few more modules that will likely break with this commit.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6120 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
@@ -161,14 +161,14 @@ extern int iax_send_url(struct iax_session *session, char *url, int link);
|
||||
extern int iax_send_text(struct iax_session *session, char *text);
|
||||
extern int iax_send_ping(struct iax_session *session);
|
||||
extern int iax_load_complete(struct iax_session *session);
|
||||
extern int iax_reject(struct iax_session *session, char *reason);
|
||||
extern int iax_reject(struct iax_session *session, const char *reason);
|
||||
int iax_reject_registration(struct iax_session *session, char *reason);
|
||||
int iax_ack_registration(struct iax_session *session);
|
||||
int iax_auth_registration(struct iax_session *session);
|
||||
extern int iax_busy(struct iax_session *session);
|
||||
extern int iax_congestion(struct iax_session *session);
|
||||
extern int iax_hangup(struct iax_session *session, char *byemsg);
|
||||
extern int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich, char *lang, int wait, int format, int capability);
|
||||
extern int iax_call(struct iax_session *session, const char *cidnum, const char *cidname, char *ich, char *lang, int wait, int format, int capability);
|
||||
extern int iax_accept(struct iax_session *session, int format);
|
||||
extern int iax_answer(struct iax_session *session);
|
||||
extern int iax_sendurl(struct iax_session *session, char *url);
|
||||
|
@@ -1691,7 +1691,7 @@ int iax_auth_registration(struct iax_session *session)
|
||||
return send_command_final(session, AST_FRAME_IAX, IAX_COMMAND_REGAUTH, 0, NULL, 0, -1);
|
||||
}
|
||||
|
||||
int iax_reject(struct iax_session *session, char *reason)
|
||||
int iax_reject(struct iax_session *session, const char *reason)
|
||||
{
|
||||
struct iax_ie_data ied;
|
||||
memset(&ied, 0, sizeof(ied));
|
||||
@@ -1986,7 +1986,7 @@ void iax_set_samplerate(struct iax_session *session, unsigned short samplemask)
|
||||
}
|
||||
|
||||
|
||||
int iax_call(struct iax_session *session, char *cidnum, char *cidname, char *ich, char *lang, int wait, int formats, int capabilities)
|
||||
int iax_call(struct iax_session *session, const char *cidnum, const char *cidname, char *ich, char *lang, int wait, int formats, int capabilities)
|
||||
{
|
||||
char tmp[256]="";
|
||||
char *part1, *part2;
|
||||
|
@@ -432,7 +432,7 @@ snprintf(tmp, (int)sizeof(tmp),
|
||||
dump_ies(fh->iedata, datalen);
|
||||
}
|
||||
|
||||
int iax_ie_append_raw(struct iax_ie_data *ied, unsigned char ie, void *data, int datalen)
|
||||
int iax_ie_append_raw(struct iax_ie_data *ied, unsigned char ie, const void *data, int datalen)
|
||||
{
|
||||
char tmp[256];
|
||||
if (datalen > ((int)sizeof(ied->buf) - ied->pos)) {
|
||||
@@ -466,7 +466,7 @@ int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned shor
|
||||
return iax_ie_append_raw(ied, ie, &newval, (int)sizeof(newval));
|
||||
}
|
||||
|
||||
int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, unsigned char *str)
|
||||
int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, const unsigned char *str)
|
||||
{
|
||||
return iax_ie_append_raw(ied, ie, str, (int)strlen((char *) str));
|
||||
}
|
||||
|
@@ -127,11 +127,11 @@ extern void iax_showframe(struct iax_frame *f, struct ast_iax2_full_hdr *fhi, in
|
||||
|
||||
extern const char *iax_ie2str(int ie);
|
||||
|
||||
extern int iax_ie_append_raw(struct iax_ie_data *ied, unsigned char ie, void *data, int datalen);
|
||||
extern int iax_ie_append_raw(struct iax_ie_data *ied, unsigned char ie, const void *data, int datalen);
|
||||
extern int iax_ie_append_addr(struct iax_ie_data *ied, unsigned char ie, struct sockaddr_in *sin);
|
||||
extern int iax_ie_append_int(struct iax_ie_data *ied, unsigned char ie, unsigned int value);
|
||||
extern int iax_ie_append_short(struct iax_ie_data *ied, unsigned char ie, unsigned short value);
|
||||
extern int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, unsigned char *str);
|
||||
extern int iax_ie_append_str(struct iax_ie_data *ied, unsigned char ie, const unsigned char *str);
|
||||
extern int iax_ie_append_byte(struct iax_ie_data *ied, unsigned char ie, unsigned char dat);
|
||||
extern int iax_ie_append(struct iax_ie_data *ied, unsigned char ie);
|
||||
extern int iax_parse_ies(struct iax_ies *ies, unsigned char *data, int datalen);
|
||||
|
@@ -257,7 +257,7 @@ char *ldl_session_get_value(ldl_session_t *session, char *key)
|
||||
return apr_hash_get(session->variables, key, APR_HASH_KEY_STRING);
|
||||
}
|
||||
|
||||
void ldl_session_set_value(ldl_session_t *session, char *key, char *val)
|
||||
void ldl_session_set_value(ldl_session_t *session, const char *key, const char *val)
|
||||
{
|
||||
apr_hash_set(session->variables, apr_pstrdup(session->pool, key), APR_HASH_KEY_STRING, apr_pstrdup(session->pool, val));
|
||||
}
|
||||
@@ -1789,18 +1789,19 @@ void ldl_handle_send_vcard(ldl_handle_t *handle, char *from, char *to, char *id,
|
||||
|
||||
}
|
||||
|
||||
void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subject, char *body)
|
||||
void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, const char *subject, const char *body)
|
||||
{
|
||||
iks *msg;
|
||||
char *t, *e;
|
||||
char *bdup = NULL;
|
||||
int on = 0;
|
||||
int len = 0;
|
||||
char *my_body = strdup(body);
|
||||
assert(handle != NULL);
|
||||
assert(body != NULL);
|
||||
|
||||
if (strchr(body, '<')) {
|
||||
len = (int) strlen(body);
|
||||
if (strchr(my_body, '<')) {
|
||||
len = (int) strlen(my_body);
|
||||
if (!(bdup = malloc(len))) {
|
||||
return;
|
||||
}
|
||||
@@ -1808,7 +1809,7 @@ void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subje
|
||||
memset(bdup, 0, len);
|
||||
|
||||
e = bdup;
|
||||
for(t = body; *t; t++) {
|
||||
for(t = my_body; *t; t++) {
|
||||
if (*t == '<') {
|
||||
on = 1;
|
||||
} else if (*t == '>') {
|
||||
@@ -1820,10 +1821,10 @@ void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subje
|
||||
*e++ = *t;
|
||||
}
|
||||
}
|
||||
body = bdup;
|
||||
my_body = bdup;
|
||||
}
|
||||
|
||||
msg = iks_make_msg(IKS_TYPE_NONE, to, body);
|
||||
msg = iks_make_msg(IKS_TYPE_NONE, to, my_body);
|
||||
iks_insert_attrib(msg, "type", "chat");
|
||||
|
||||
if (!from) {
|
||||
@@ -1840,6 +1841,8 @@ void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subje
|
||||
free(bdup);
|
||||
}
|
||||
|
||||
free(my_body);
|
||||
|
||||
apr_queue_push(handle->queue, msg);
|
||||
msg = NULL;
|
||||
|
||||
|
@@ -309,7 +309,7 @@ char *ldl_session_get_value(ldl_session_t *session, char *key);
|
||||
\param key the key to set
|
||||
\param val the value of the key
|
||||
*/
|
||||
void ldl_session_set_value(ldl_session_t *session, char *key, char *val);
|
||||
void ldl_session_set_value(ldl_session_t *session, const char *key, const char *val);
|
||||
|
||||
/*!
|
||||
\brief Create a Jingle Session
|
||||
@@ -473,7 +473,7 @@ void ldl_handle_send_vcard(ldl_handle_t *handle, char *from, char *to, char *id,
|
||||
\param subject optional subject
|
||||
\param body body of the message
|
||||
*/
|
||||
void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, char *subject, char *body);
|
||||
void ldl_handle_send_msg(ldl_handle_t *handle, char *from, char *to, const char *subject, const char *body);
|
||||
|
||||
/*!
|
||||
\brief Offer candidates to a potential session
|
||||
|
@@ -314,7 +314,7 @@ static char *my_strdup (const char *s)
|
||||
return (char *) memcpy (new, s, len);
|
||||
}
|
||||
|
||||
int teletone_run(teletone_generation_session_t *ts, char *cmd)
|
||||
int teletone_run(teletone_generation_session_t *ts, const char *cmd)
|
||||
{
|
||||
char *data = NULL, *cur = NULL, *end = NULL;
|
||||
int var = 0, LOOPING = 0;
|
||||
|
@@ -276,7 +276,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
|
||||
\param cmd the script to execute
|
||||
\return 0
|
||||
*/
|
||||
int teletone_run(teletone_generation_session_t *ts, char *cmd);
|
||||
int teletone_run(teletone_generation_session_t *ts, const char *cmd);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
Reference in New Issue
Block a user