From e5449329411c095c3275425249f125cfd8cdd861 Mon Sep 17 00:00:00 2001 From: Max Lv Date: Fri, 22 Feb 2013 21:42:37 +0800 Subject: [PATCH] refine --- assets/shadowsocks | Bin 42312 -> 42312 bytes jni/shadowsocks/encrypt.c | 10 +++++----- jni/shadowsocks/encrypt.h | 2 +- jni/shadowsocks/local.c | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/assets/shadowsocks b/assets/shadowsocks index 681179f33651399413f4cf17100c4f20b7b375ce..48af64b239905e489e7f62c2e264957b1c629f0f 100755 GIT binary patch delta 6066 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 CSRAVW delta 6156 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 // get remote addr and port @@ -191,14 +191,14 @@ static void server_recv_cb (EV_P_ ev_io *w, int revents) { } else if (request->atyp == 3) { // Domain name - unsigned char name_len = *(unsigned char *)(server->buf + 4); + uint8_t name_len = *(uint8_t *)(server->buf + 4); addr_to_send[addr_len++] = name_len; memcpy(addr_to_send + addr_len, server->buf + 4 + 1, name_len); addr_len += name_len; // get port - addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 1 + name_len); - addr_to_send[addr_len++] = *(unsigned char *)(server->buf + 4 + 1 + name_len + 1); + addr_to_send[addr_len++] = *(uint8_t *)(server->buf + 4 + 1 + name_len); + addr_to_send[addr_len++] = *(uint8_t *)(server->buf + 4 + 1 + name_len + 1); } else { LOGE("unsupported addrtype: %d\n", request->atyp); close_and_free_remote(EV_A_ remote);