Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate load16_be() function in favor to ntohs() function. #2953

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Deprecate load16_be() function in favor to ntohs() function. #2953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f2e821
Update aead.c
starter48 Jan 9, 2023
2c68b78
Update local.c
starter48 Jan 9, 2023
ee64533
Update server.c
starter48 Jan 9, 2023
d5a3a70
Update udprelay.c
starter48 Jan 9, 2023
477bfc9
Update utils.h
starter48 Jan 9, 2023
cf7337e
Update utils.c
starter48 Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aead.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ aead_chunk_decrypt(cipher_ctx_t *ctx, uint8_t *p, uint8_t *c, uint8_t *n,
return CRYPTO_ERROR;
assert(*plen == CHUNK_SIZE_LEN);

mlen = load16_be(len_buf);
mlen = ntohs(*(uint16_t*)len_buf);
mlen = mlen & CHUNK_SIZE_MASK;

if (mlen == 0)
Expand Down
6 changes: 3 additions & 3 deletions src/local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ server_handshake(EV_P_ ev_io *w, buffer_t *buf)
abuf->len += in_addr_len + 2;

if (acl || verbose) {
uint16_t p = load16_be(buf->data + request_len + in_addr_len);
uint16_t p = ntohs(*(uint16_t*)(buf->data + request_len + in_addr_len));
if (!inet_ntop(AF_INET, (const void *)(buf->data + request_len),
ip, INET_ADDRSTRLEN)) {
LOGI("inet_ntop(AF_INET): %s", strerror(errno));
Expand All @@ -400,7 +400,7 @@ server_handshake(EV_P_ ev_io *w, buffer_t *buf)
abuf->len += name_len + 2;

if (acl || verbose) {
uint16_t p = load16_be(buf->data + request_len + 1 + name_len);
uint16_t p = ntohs(*(uint16_t*)(buf->data + request_len + 1 + name_len));
memcpy(host, buf->data + request_len + 1, name_len);
host[name_len] = '\0';
sprintf(port, "%d", p);
Expand All @@ -414,7 +414,7 @@ server_handshake(EV_P_ ev_io *w, buffer_t *buf)
abuf->len += in6_addr_len + 2;

if (acl || verbose) {
uint16_t p = load16_be(buf->data + request_len + in6_addr_len);
uint16_t p = ntohs(*(uint16_t*)(buf->data + request_len + in6_addr_len));
if (!inet_ntop(AF_INET6, (const void *)(buf->data + request_len),
ip, INET6_ADDRSTRLEN)) {
LOGI("inet_ntop(AF_INET6): %s", strerror(errno));
Expand Down
2 changes: 1 addition & 1 deletion src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@ server_recv_cb(EV_P_ ev_io *w, int revents)
return;
}

port = ntohs(load16_be(server->buf->data + offset));
port = *(uint16_t*)(server->buf->data + offset);

offset += 2;

Expand Down
2 changes: 1 addition & 1 deletion src/udprelay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ parse_udprelay_header(const char *buf, const size_t buf_len,
}

if (port != NULL) {
sprintf(port, "%d", load16_be(buf + offset));
sprintf(port, "%d", ntohs(*(uint16_t*)(buf + offset)));
}
offset += 2;

Expand Down
8 changes: 0 additions & 8 deletions src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,14 +571,6 @@ get_default_conf(void)
#endif
}

uint16_t
load16_be(const void *s)
{
const uint8_t *in = (const uint8_t *)s;
return ((uint16_t)in[0] << 8)
| ((uint16_t)in[1]);
}

int
get_mptcp(int enable)
{
Expand Down
1 change: 0 additions & 1 deletion src/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ void *ss_realloc(void *ptr, size_t new_size);

int ss_is_ipv6addr(const char *addr);
char *get_default_conf(void);
uint16_t load16_be(const void *s);
int get_mptcp(int enable);

#endif // _UTILS_H