diff options
Diffstat (limited to 'src/nSocket/nstack')
| -rw-r--r-- | src/nSocket/nstack/nstack_info_parse.c | 8 | ||||
| -rw-r--r-- | src/nSocket/nstack/nstack_module.h | 10 | ||||
| -rw-r--r-- | src/nSocket/nstack/nstack_nsocket_construct.c | 2 | ||||
| -rw-r--r-- | src/nSocket/nstack/nstack_socket.c | 27 |
4 files changed, 18 insertions, 29 deletions
diff --git a/src/nSocket/nstack/nstack_info_parse.c b/src/nSocket/nstack/nstack_info_parse.c index 06c956b..99e6df7 100644 --- a/src/nSocket/nstack/nstack_info_parse.c +++ b/src/nSocket/nstack/nstack_info_parse.c @@ -18,13 +18,13 @@ #define _GNU_SOURCE #endif -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> /* sys/types.h */ +#include <sys/stat.h> /* sys/stat.h */ +#include <fcntl.h> /* fcntl.h */ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <errno.h> +#include <errno.h> /* errno.h */ #include "json.h" #include "nsfw_base_linux_api.h" #include "nstack_info_parse.h" diff --git a/src/nSocket/nstack/nstack_module.h b/src/nSocket/nstack/nstack_module.h index 2aa5d3b..ac0b57d 100644 --- a/src/nSocket/nstack/nstack_module.h +++ b/src/nSocket/nstack/nstack_module.h @@ -38,16 +38,6 @@ extern "C"{ #define NSTACK_MAX_MODULE_NUM 8 #define NSTACK_PRO_MODULE 1 -#define MOD_INDEX_FOR_KERNEL 0 -#define MOD_NAME_FOR_KERNEL "kernel" -#define LIB_NAME_FOR_KERNEL "liblinuxkernel.so" -#define MAX_SOCK_FOR_KERNEL (MAX_SOCKET_NUM-1) - -#define MIN_SOCK_FOR_KERNEL 0 - -#define LIB_NAME_FOR_STACKX "libnstack.so" -#define MAX_SOCK_FOR_STACKX MAX_SOCKET_NUM - #define MIN_SOCK_FOR_STACKX 0 #define MOD_PRI_FOR_STACKX 1 diff --git a/src/nSocket/nstack/nstack_nsocket_construct.c b/src/nSocket/nstack/nstack_nsocket_construct.c index 31f2b55..0b447b7 100644 --- a/src/nSocket/nstack/nstack_nsocket_construct.c +++ b/src/nSocket/nstack/nstack_nsocket_construct.c @@ -40,4 +40,4 @@ NSFW_MODULE_INIT (nstack_app_init) /* *INDENT-OFF* */ } /* *INDENT-ON* */ -#endif /* __cplusplus */
\ No newline at end of file +#endif /* __cplusplus */ diff --git a/src/nSocket/nstack/nstack_socket.c b/src/nSocket/nstack/nstack_socket.c index d32958c..5c3cacb 100644 --- a/src/nSocket/nstack/nstack_socket.c +++ b/src/nSocket/nstack/nstack_socket.c @@ -149,7 +149,6 @@ nstack_socket (int domain, int itype, int protocol) nstack_rd_key rdkey = { 0 }; int selectmod = -1; - /*check whether module init finish or not */ NSTACK_INIT_CHECK_RET (socket); @@ -288,7 +287,6 @@ nstack_bind (int fd, const struct sockaddr *addr, socklen_t addrlen) struct sockaddr_in *iaddr = NULL; nstack_rd_key rdkey = { 0 }; - NSSOC_LOGINF ("(sockfd=%d, addr=%p, addrlen=%u) [Caller]", fd, addr, addrlen); @@ -1140,7 +1138,7 @@ nstack_send (int fd, const void *buf, size_t len, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, send, (fdInf->rlfd, buf, len, flags), size); + NSTACK_CAL_FUN (fdInf->ops, send, (fdInf->rlfd, buf, len, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1173,7 +1171,7 @@ nstack_recv (int fd, void *buf, size_t len, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, recv, (fdInf->rlfd, buf, len, flags), size); + NSTACK_CAL_FUN (fdInf->ops, recv, (fdInf->rlfd, buf, len, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1205,7 +1203,7 @@ nstack_write (int fd, const void *buf, size_t count) return -1; } - NSTACK_CAL_FUN(fdInf->ops, write, (fdInf->rlfd, buf, count), size); + NSTACK_CAL_FUN (fdInf->ops, write, (fdInf->rlfd, buf, count), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1236,7 +1234,7 @@ nstack_read (int fd, void *buf, size_t count) return -1; } - NSTACK_CAL_FUN(fdInf->ops, read, (fdInf->rlfd, buf, count), size); + NSTACK_CAL_FUN (fdInf->ops, read, (fdInf->rlfd, buf, count), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1268,8 +1266,7 @@ nstack_writev (int fd, const struct iovec * iov, int iovcnt) return -1; } - - NSTACK_CAL_FUN(fdInf->ops, writev, (fdInf->rlfd, iov, iovcnt), size); + NSTACK_CAL_FUN (fdInf->ops, writev, (fdInf->rlfd, iov, iovcnt), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1301,7 +1298,7 @@ nstack_readv (int fd, const struct iovec * iov, int iovcnt) return -1; } - NSTACK_CAL_FUN(fdInf->ops, readv, (fdInf->rlfd, iov, iovcnt), size); + NSTACK_CAL_FUN (fdInf->ops, readv, (fdInf->rlfd, iov, iovcnt), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1335,7 +1332,9 @@ nstack_sendto (int fd, const void *buf, size_t len, int flags, if (fdInf->ops) { - NSTACK_CAL_FUN(fdInf->ops, sendto, (fdInf->rlfd, buf, len, flags, dest_addr, addrlen), size); + NSTACK_CAL_FUN (fdInf->ops, sendto, + (fdInf->rlfd, buf, len, flags, dest_addr, addrlen), + size); NSSOC_LOGDBG ("fdInf->ops:fd=%d buf=%p,len=%zu,size=%d,addr=%p [Return]", fd, buf, @@ -1421,7 +1420,7 @@ nstack_sendmsg (int fd, const struct msghdr * msg, int flags) /*if some module select, just connect */ if (fdInf->ops) { - NSTACK_CAL_FUN(fdInf->ops, sendmsg, (fdInf->rlfd, msg, flags), size); + NSTACK_CAL_FUN (fdInf->ops, sendmsg, (fdInf->rlfd, msg, flags), size); NSSOC_LOGDBG ("]fd=%d,size=%d msg=%p [Return]", fd, size, msg); UNLOCK_SEND (fd, local_lock); return size; @@ -1510,7 +1509,8 @@ nstack_recvfrom (int fd, void *buf, size_t len, int flags, return -1; } - NSTACK_CAL_FUN(fdInf->ops, recvfrom, (fdInf->rlfd, buf, len, flags, src_addr, addrlen), size); + NSTACK_CAL_FUN (fdInf->ops, recvfrom, + (fdInf->rlfd, buf, len, flags, src_addr, addrlen), size); NSSOC_LOGDBG ("fd=%d,retVal=%d [Return]", fd, size); @@ -1542,7 +1542,7 @@ nstack_recvmsg (int fd, struct msghdr * msg, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, recvmsg, (fdInf->rlfd, msg, flags), size); + NSTACK_CAL_FUN (fdInf->ops, recvmsg, (fdInf->rlfd, msg, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -2450,7 +2450,6 @@ nstack_epoll_create (int size) nstack_socket_ops *ops; int ret = 0; - NSTACK_INIT_CHECK_RET (epoll_create); NSSOC_LOGINF ("(size=%d) [Caller]", size); |