cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix MSN file transfer support on big-endian systems

Browse Source
This commit is contained in:
brad 2004-09-22 05:49:56 +00:00
parent da8e0be7d4
commit 20b4a57398
2 changed files with 133 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/gaim/patches/patch-src_protocols_msn_slp_c Normal file
View File

@ -0,0 +1,34 @@
$OpenBSD: patch-src_protocols_msn_slp_c,v 1.3 2004/09/22 05:49:56 brad Exp $
--- src/protocols/msn/slp.c.orig Tue Aug 24 21:45:41 2004
+++ src/protocols/msn/slp.c Wed Sep 22 01:23:39 2004
@@ -235,6 +235,8 @@ send_decline(MsnSlpCall *slpcall, const
msn_slplink_queue_slpmsg(slplink, slpmsg);
}
+#define MAX_FILE_NAME_LEN 0x226
+
static void
got_sessionreq(MsnSlpCall *slpcall, const char *branch,
const char *euf_guid, const char *context)
@@ -318,6 +320,7 @@ got_sessionreq(MsnSlpCall *slpcall, cons
gsize bin_len;
guint32 file_size;
char *file_name;
+ gunichar2 *uni_name;
account = slpcall->slplink->session->account;
@@ -331,6 +334,13 @@ got_sessionreq(MsnSlpCall *slpcall, cons
gaim_base64_decode(context, &bin, &bin_len);
file_size = GUINT32_FROM_LE(*((gsize *)bin + 2));
+
+ uni_name = (gunichar2 *)(bin + 20);
+ while(*uni_name != 0 && ((char *)uni_name - (bin + 20)) < MAX_FILE_NAME_LEN) {
+ *uni_name = GUINT16_FROM_LE(*uni_name);
+ uni_name++;
+ }
+
file_name = g_utf16_to_utf8((const gunichar2 *)(bin + 20), -1,
NULL, NULL, NULL);

99
net/gaim/patches/patch-src_protocols_msn_slplink_c Normal file
View File

@ -0,0 +1,99 @@
$OpenBSD: patch-src_protocols_msn_slplink_c,v 1.1 2004/09/22 05:49:56 brad Exp $
--- src/protocols/msn/slplink.c.orig Tue Aug 24 21:45:41 2004
+++ src/protocols/msn/slplink.c Wed Sep 22 01:23:42 2004
@@ -571,24 +571,34 @@ typedef struct
#define MAX_FILE_NAME_LEN 0x226
static char *
-gen_context(const char *file_name)
+gen_context(const char *file_name, const char *file_path)
{
struct stat st;
gsize size = 0;
MsnContextHeader header;
- gchar *u8;
+ gchar *u8 = NULL;
gchar *base, *n;
- gunichar2 *uni;
- glong uni_len;
+ gunichar2 *uni = NULL;
+ glong currentChar = 0;
+ glong uni_len = 0;
gsize len;
if (stat(file_name, &st) == 0)
size = st.st_size;
- u8 = gaim_utf8_try_convert(g_basename(file_name));
- uni = g_utf8_to_utf16(u8, -1, NULL, &uni_len, NULL);
- g_free(u8);
+ if(!file_name) {
+ u8 = gaim_utf8_try_convert(g_basename(file_path));
+ file_name = u8;
+ }
+ uni = g_utf8_to_utf16(file_name, -1, NULL, &uni_len, NULL);
+
+ if(u8) {
+ g_free(u8);
+ file_name = NULL;
+ u8 = NULL;
+ }
+
len = sizeof(MsnContextHeader) + MAX_FILE_NAME_LEN + 4;
header.length = GUINT32_TO_LE(len);
@@ -596,21 +606,23 @@ gen_context(const char *file_name)
header.file_size = GUINT32_TO_LE(size);
header.unk2 = GUINT32_TO_LE(0);
header.unk3 = GUINT32_TO_LE(0);
+
+ base = g_malloc(len + 1);
+ n = base;
- base = n = g_malloc(len + 1);
-
memcpy(n, &header, sizeof(MsnContextHeader));
n += sizeof(MsnContextHeader);
memset(n, 0x00, MAX_FILE_NAME_LEN);
- memcpy(n, uni, uni_len * 2);
+ for(currentChar = 0; currentChar < uni_len; currentChar++) {
+ *((gunichar2 *)n + currentChar) = GUINT16_TO_LE(uni[currentChar]);
+ }
n += MAX_FILE_NAME_LEN;
memset(n, 0xFF, 4);
n += 4;
-
+
g_free(uni);
-
return gaim_base64_encode(base, len);
}
@@ -620,11 +632,13 @@ msn_slplink_request_ft(MsnSlpLink *slpli
MsnSlpCall *slpcall;
char *context;
const char *fn;
+ const char *fp;
- fn = gaim_xfer_get_local_filename(xfer);
+ fn = gaim_xfer_get_filename(xfer);
+ fp = gaim_xfer_get_local_filename(xfer);
g_return_if_fail(slplink != NULL);
- g_return_if_fail(fn != NULL);
+ g_return_if_fail(fp != NULL);
slpcall = msn_slp_call_new(slplink);
msn_slp_call_init(slpcall, MSN_SLPCALL_DC);
@@ -639,7 +653,7 @@ msn_slplink_request_ft(MsnSlpLink *slpli
xfer->data = slpcall;
- context = gen_context(fn);
+ context = gen_context(fn, fp);
msn_slp_call_invite(slpcall, "5D3E02AB-6190-11D3-BBBB-00C04F795683", 2,
context);