hwelte
/
mbuni
1
0
Fork 0
Code Releases Activity

- Fixed error in interpretation of DeliveryReport field of MM7/SOAP 

- Further cleanups of uaprof module
This commit is contained in:
bagyenda 2006-02-28 04:38:23 +00:00
parent e13422bab4
commit 47904ecd65
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mbuni/mmlib/mms_mm7soap.c
View File

@ -752,14 +752,18 @@ MmsMsg *mm7_soap_to_mmsmsg(MSoapMsg_t *m, Octstr *from)
}
if ((s = http_header_value(m->envelope, octstr_imm("DeliveryReport"))) != NULL) {
if (mms_string_to_reports(s) >= 0)
mms_replace_header_value(msg, "X-Mms-Delivery-Report", octstr_get_cstr(s));
long x = mms_string_to_boolean_flag(s);
if (x >= 0)
mms_replace_header_value(msg, "X-Mms-Delivery-Report",
(char *)mms_reports_to_cstr(x));
octstr_destroy(s);
}
if ((s = http_header_value(m->envelope, octstr_imm("ReadReply"))) != NULL) {
if (mms_string_to_reports(s) >= 0)
mms_replace_header_value(msg, "X-Mms-Read-Report", octstr_get_cstr(s));
long x = mms_string_to_boolean_flag(s);
if (x >= 0)
mms_replace_header_value(msg, "X-Mms-Read-Report",
(char *)mms_reports_to_cstr(x));
octstr_destroy(s);
}

6
mbuni/mmlib/mms_strings.def
View File

@ -116,6 +116,12 @@ STRING("Yes")
STRING("No")
)
/* the ones below are wired to agree with flags above. */
LINEAR(boolean_flag,
STRING("true")
STRING("false")
)
NAMED(message_type,
VNSTRING(MS_1_1,"m-send-req", MMS_MSGTYPE_SEND_REQ)
VNSTRING(MS_1_1,"m-send-conf", MMS_MSGTYPE_SEND_CONF)

22
mbuni/mmlib/mms_uaprof.c
View File

@ -362,14 +362,6 @@ static int unreplace_slash(int ch)
return (ch == '$') ? '/' : ch;
}
#define UACOUNT_PROFILE 1023
static void init_profiledict(void)
{
if (!profile_dict)
profile_dict = dict_create(UACOUNT_PROFILE, (void (*)(void *))destroy_uaprof);
}
static int mms_load_ua_profile_cache(char *dir)
{
@ -488,13 +480,20 @@ static MmsUaProfile *profile_fetch(Octstr *profile_url)
}
static void init_format_table(void);
#define UACOUNT_PROFILE 1023
int mms_start_profile_engine(char *cache_dir)
{
init_profiledict();
if (profile_dict)
return 0;
profile_dir = octstr_create(cache_dir);
if (!profile_dict)
profile_dict = dict_create(UACOUNT_PROFILE,
(void (*)(void *))destroy_uaprof);
init_format_table();
mms_load_ua_profile_cache(cache_dir);
profile_dir = octstr_create(cache_dir);
return 0;
}
@ -505,6 +504,7 @@ int mms_stop_profile_engine(void)
if (profile_dir)
octstr_destroy(profile_dir);
dict_destroy(profile_dict);
profile_dict = NULL;
return 0;
}