refactor: refine restrict usage

Signed-off-by: He Xian <hexian000@outlook.com>

Author: hexian000

client.json

@@ -16,6 +16,6 @@
     },
     "method": "xchacha20poly1305_ietf",
     "password": "k",
-    "loglevel": 5,
-    "user": "nobody:"
+    "loglevel": 7,
+    "obfs": "dpi/tcp"
 }

contrib/csnippets/algo/hashtable.c

@@ -198,7 +198,7 @@ static inline void table_reseed(struct hashtable *restrict table)
 
 struct hashtable *table_set(
 	struct hashtable *restrict table, const struct hashkey key,
-	void **restrict element)
+	void **element)
 {
 	assert(table != NULL && element != NULL);
 	const uint_least32_t hash = GET_HASH(key, table->seed);
@@ -264,7 +264,7 @@ struct hashtable *table_set(
 
 bool table_find(
 	const struct hashtable *restrict table, const struct hashkey key,
-	void **element)
+	void **restrict element)
 {
 	if (table == NULL) {
 		return false;
@@ -287,7 +287,7 @@ bool table_find(
 
 struct hashtable *table_del(
 	struct hashtable *restrict table, const struct hashkey key,
-	void **restrict element)
+	void **element)
 {
 	if (table == NULL) {
 		return NULL;
@@ -382,7 +382,8 @@ table_reserve(struct hashtable *restrict table, const size_t new_size)
 }
 
 struct hashtable *table_filter(
-	struct hashtable *restrict table, const table_iterate_cb f, void *data)
+	struct hashtable *restrict table, const table_iterate_cb f,
+	void *restrict data)
 {
 	if (table == NULL) {
 		return NULL;
@@ -416,7 +417,7 @@ struct hashtable *table_filter(
 
 void table_iterate(
 	const struct hashtable *restrict table, const table_iterate_cb f,
-	void *data)
+	void *restrict data)
 {
 	if (table == NULL) {
 		return;

server.json

@@ -16,6 +16,6 @@
     },
     "method": "xchacha20poly1305_ietf",
     "password": "k",
-    "loglevel": 5,
-    "user": "nobody:"
+    "loglevel": 7,
+    "obfs": "dpi/tcp"
 }

src/crypto.c

@@ -89,9 +89,9 @@ struct crypto_impl {
 };
 
 size_t crypto_seal(
-	const struct crypto *restrict crypto, unsigned char *dst,
-	const size_t dst_size, const unsigned char *nonce,
-	const unsigned char *plain, const size_t plain_size)
+	const struct crypto *restrict crypto, unsigned char *restrict dst,
+	const size_t dst_size, const unsigned char *restrict nonce,
+	const unsigned char *restrict plain, const size_t plain_size)
 {
 	if (dst_size < plain_size + crypto->overhead) {
 		LOGW_F("crypto_seal: insufficient crypto buffer %zu < %zu",
@@ -122,9 +122,9 @@ size_t crypto_seal(
 }
 
 size_t crypto_open(
-	const struct crypto *restrict crypto, unsigned char *dst,
-	const size_t dst_size, const unsigned char *nonce,
-	const unsigned char *cipher, const size_t cipher_size)
+	const struct crypto *restrict crypto, unsigned char *restrict dst,
+	const size_t dst_size, const unsigned char *restrict nonce,
+	const unsigned char *restrict cipher, const size_t cipher_size)
 {
 	if (dst_size + crypto->overhead < cipher_size) {
 		LOGW("crypto_seal: insufficient crypto buffer");

src/event_tcp.c

@@ -55,7 +55,7 @@ static void modify_io_events(
 
 static void accept_one(
 	struct server *restrict s, const int fd,
-	const struct sockaddr *client_sa)
+	const struct sockaddr *restrict client_sa)
 {
 	/* Initialize and start watcher to read client requests */
 	const uint32_t conv = conv_new(s, &s->pkt.kcp_connect.sa);

src/event_timer.c

@@ -25,13 +25,13 @@
 void listener_cb(struct ev_loop *loop, ev_timer *watcher, const int revents)
 {
 	CHECK_REVENTS(revents, EV_TIMER);
-	struct listener *restrict l = watcher->data;
+	struct listener *l = watcher->data;
 	/* check & restart accept watchers */
-	ev_io *restrict w_accept = &l->w_accept;
+	ev_io *w_accept = &l->w_accept;
 	if (l->fd != -1 && !ev_is_active(w_accept)) {
 		ev_io_start(loop, w_accept);
 	}
-	ev_io *restrict w_accept_http = &l->w_accept_http;
+	ev_io *w_accept_http = &l->w_accept_http;
 	if (l->fd_http != -1 && !ev_is_active(w_accept_http)) {
 		ev_io_start(loop, w_accept_http);
 	}

src/main.c

@@ -244,21 +244,21 @@ int main(int argc, char **argv)
 	/* Set up signal watchers for graceful shutdown and config reload */
 	{
 		/* SIGHUP: reload configuration */
-		ev_signal *restrict w_sighup = &app.w_sighup;
+		ev_signal *w_sighup = &app.w_sighup;
 		ev_signal_init(w_sighup, signal_cb, SIGHUP);
 		ev_set_priority(w_sighup, EV_MAXPRI);
 		w_sighup->data = s;
 		ev_signal_start(loop, w_sighup);
 
 		/* SIGINT: graceful shutdown (Ctrl+C) */
-		ev_signal *restrict w_sigint = &app.w_sigint;
+		ev_signal *w_sigint = &app.w_sigint;
 		ev_signal_init(w_sigint, signal_cb, SIGINT);
 		ev_set_priority(w_sigint, EV_MAXPRI);
 		w_sigint->data = s;
 		ev_signal_start(loop, w_sigint);
 
 		/* SIGTERM: graceful shutdown (service stop) */
-		ev_signal *restrict w_sigterm = &app.w_sigterm;
+		ev_signal *w_sigterm = &app.w_sigterm;
 		ev_signal_init(w_sigterm, signal_cb, SIGTERM);
 		ev_set_priority(w_sigterm, EV_MAXPRI);
 		w_sigterm->data = s;

src/obfs.c

@@ -137,8 +137,8 @@ struct obfs_ctx {
 		.data = (ctx)->key,                                            \
 	})
 
-static inline struct obfs_ctx *
-obfs_find_ctx(const struct obfs *restrict obfs, const struct sockaddr *sa)
+static inline struct obfs_ctx *obfs_find_ctx(
+	const struct obfs *restrict obfs, const struct sockaddr *restrict sa)
 {
 	unsigned char key[OBFS_CTX_KEY_SIZE];
 	const size_t n = getsocklen(sa);
@@ -225,7 +225,7 @@ static inline uint16_t in_cksum_fin(uint32_t sum, const void *data, size_t n)
 static uint16_t tcp_checksum(
 	const int domain, const union sockaddr_max *restrict src,
 	const union sockaddr_max *restrict dst, struct tcphdr *restrict tcp,
-	const void *data, const size_t datalen)
+	const void *restrict data, const size_t datalen)
 {
 	const uint16_t plen = sizeof(struct tcphdr) + datalen;
 	uint32_t sum = 0;

src/session.c

@@ -423,7 +423,8 @@ struct session0_header {
 
 #define SESSION0_HEADER_SIZE (sizeof(uint32_t) + sizeof(uint16_t))
 
-static inline struct session0_header ss0_header_read(const unsigned char *d)
+static inline struct session0_header
+ss0_header_read(const unsigned char *restrict d)
 {
 	return (struct session0_header){
 		.zero = read_uint32(d),
@@ -432,7 +433,7 @@ static inline struct session0_header ss0_header_read(const unsigned char *d)
 }
 
 static inline void
-ss0_header_write(unsigned char *d, const struct session0_header header)
+ss0_header_write(unsigned char *restrict d, const struct session0_header header)
 {
 	write_uint32(d, header.zero);
 	write_uint16(d + sizeof(uint32_t), header.what);