pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfixed: use new_addr instead of addr

pull/37/head
YuQing 2020-02-21 20:45:20 +08:00
parent 6e5511614d
commit fd4368e6e2
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -1,5 +1,5 @@
Version 1.44 2020-02-20 Version 1.44 2020-02-21
* add test file src/tests/test_pthread_lock.c * add test file src/tests/test_pthread_lock.c
* add uniq_skiplist.[hc] * add uniq_skiplist.[hc]
* add function split_string_ex * add function split_string_ex

16
src/server_id_func.c
View File

@ -138,7 +138,7 @@ static int fc_server_check_alloc_group_addresses(FCAddressArray *array)
} }
static FCAddressInfo *fc_server_add_to_uniq_addresses( static FCAddressInfo *fc_server_add_to_uniq_addresses(
FCAddressArray *addr_array, FCAddressInfo *addr) FCAddressArray *addr_array, const FCAddressInfo *addr)
{ {
FCAddressInfo *p; FCAddressInfo *p;
FCAddressInfo *end; FCAddressInfo *end;
@ -728,7 +728,7 @@ static int fc_server_set_address(FCServerConfig *ctx,
} }
static int fc_server_set_group_server_address(FCServerInfo *server, static int fc_server_set_group_server_address(FCServerInfo *server,
FCGroupAddresses *group_addr, FCAddressInfo *address) FCGroupAddresses *group_addr, const FCAddressInfo *address)
{ {
FCAddressInfo *addr; FCAddressInfo *addr;
int result; int result;
@ -797,11 +797,13 @@ static int fc_server_load_group_server(FCServerConfig *ctx,
static int fc_server_set_host(FCServerConfig *ctx, FCServerInfo *server, static int fc_server_set_host(FCServerConfig *ctx, FCServerInfo *server,
const char *config_filename, const char *section_name, const char *config_filename, const char *section_name,
FCAddressInfo *addr) const FCAddressInfo *addr)
{ {
FCServerGroupInfo *group; FCServerGroupInfo *group;
FCServerGroupInfo *end; FCServerGroupInfo *end;
FCGroupAddresses *group_addr; FCGroupAddresses *group_addr;
const FCAddressInfo *new_addr;
FCAddressInfo addr_holder;
int result; int result;
int count; int count;
int group_index; int group_index;
@ -823,10 +825,14 @@ static int fc_server_set_host(FCServerConfig *ctx, FCServerInfo *server,
} }
if (addr->conn.port == 0) { if (addr->conn.port == 0) {
addr->conn.port = FC_SERVER_GROUP_PORT(group); addr_holder = *addr;
addr_holder.conn.port = FC_SERVER_GROUP_PORT(group);
new_addr = &addr_holder;
} else {
new_addr = addr;
} }
if ((result=fc_server_set_group_server_address(server, if ((result=fc_server_set_group_server_address(server,
group_addr, addr)) != 0) group_addr, new_addr)) != 0)
{ {
return result; return result;
} }