Skip to content

Commit f0ca4b3

Browse files
committed
const string refined.
1 parent afbc64c commit f0ca4b3

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/client/client.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,7 +1292,7 @@ static void tls_cli_on_connection_established(struct tls_cli_ctx* tls_cli, int s
12921292
buf = websocket_connect_request(domain, domain_port, url_path, ctx->sec_websocket_key, &malloc, &len);
12931293
{
12941294
char* b64addr = std_base64_encode_alloc(typ, (size_t)typ_len, &malloc);
1295-
static const char* addr_fmt = "Target-Address" ": %s\r\n";
1295+
static const char* addr_fmt = TARGET_ADDRESS_STR ": %s\r\n";
12961296
char* addr_field = (char*)calloc(strlen(addr_fmt) + strlen(b64addr) + 1, sizeof(*addr_field));
12971297
sprintf(addr_field, addr_fmt, b64addr);
12981298
buf = http_header_append_new_field(buf, &len, &realloc, addr_field);
@@ -1303,7 +1303,7 @@ static void tls_cli_on_connection_established(struct tls_cli_ctx* tls_cli, int s
13031303
size_t addr_len = 0;
13041304
uint8_t* addr_p = socks5_address_binary(&ctx->udp_data_ctx->target_addr, &malloc, &addr_len);
13051305
char* b64str = url_safe_base64_encode_alloc(addr_p, (size_t)addr_len, &malloc);
1306-
static const char* udp_fmt = "UDP" ": %s\r\n";
1306+
static const char* udp_fmt = UDP_STR ": %s\r\n";
13071307
char* udp_field = (char*)calloc(strlen(udp_fmt) + strlen(b64str) + 1, sizeof(*udp_field));
13081308
sprintf(udp_field, udp_fmt, b64str);
13091309
buf = http_header_append_new_field(buf, &len, &realloc, udp_field);

src/config_json.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,13 @@ struct server_config* parse_config_file(bool is_server, const char* file)
142142
continue;
143143
}
144144

145-
if (json_iter_extract_bool("udp", &iter, &obj_bool)) {
145+
{
146+
char udp[10] = UDP_STR;
147+
if (json_iter_extract_bool(strlwr(udp), &iter, &obj_bool)) {
146148
config->udp = obj_bool;
147149
continue;
148150
}
151+
}
149152
if (json_iter_extract_int("idle_timeout", &iter, &obj_int)) {
150153
config->idle_timeout = obj_int * MILLISECONDS_PER_SECOND;
151154
continue;

src/server/server.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,11 @@ int main(int argc, char * const argv[]) {
159159
sigaction(SIGPIPE, &sa, NULL);
160160
#endif // defined(__unix__) || defined(__linux__)
161161

162+
#if CHECK_MEM_LEAK
162163
MEM_CHECK_BEGIN();
163164
MEM_CHECK_BREAK_ALLOC(63);
164165
MEM_CHECK_BREAK_ALLOC(64);
166+
#endif
165167
atexit(on_atexit);
166168

167169
do {
@@ -1146,7 +1148,7 @@ static void do_tls_init_package(struct tunnel_ctx *tunnel, struct socket_ctx *so
11461148
{
11471149
uint8_t* addr_p;
11481150
size_t p_len = 0;
1149-
const char* addr_field = http_headers_get_field_val(hdrs, "Target-Address");
1151+
const char* addr_field = http_headers_get_field_val(hdrs, TARGET_ADDRESS_STR);
11501152
if (addr_field == NULL) {
11511153
do_normal_response(tunnel);
11521154
break;
@@ -1162,7 +1164,7 @@ static void do_tls_init_package(struct tunnel_ctx *tunnel, struct socket_ctx *so
11621164
ASSERT(obfs_receipt == NULL);
11631165
ASSERT(proto_confirm == NULL);
11641166

1165-
udp_field = http_headers_get_field_val(hdrs, "UDP");
1167+
udp_field = http_headers_get_field_val(hdrs, UDP_STR);
11661168
if (udp_field != NULL) {
11671169
uv_loop_t *loop = socket->handle.tcp.loop;
11681170
struct socks5_address target_addr = { {{0}}, 0, SOCKS5_ADDRTYPE_INVALID };

src/ssr_executive.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ void string_safe_assign(char **target, const char *value);
9191
#define DEFAULT_UDP_TIMEOUT (6 * MILLISECONDS_PER_SECOND)
9292
#define DEFAULT_METHOD "aes-128-ctr"
9393
#define DEFAULT_SSROT_PATH "/abcd1234/"
94+
#define TARGET_ADDRESS_STR "Target-Address"
95+
#define UDP_STR "UDP"
9496

9597
#if !defined(TCP_BUF_SIZE_MAX)
9698
#define TCP_BUF_SIZE_MAX (16 * 1024 - 1) // 16383 (0x3FFF) Bytes, equals to the max chunk size

0 commit comments

Comments
 (0)