Added .clang-format, formatted codebase

2026-01-24 02:40:49 +00:00 · 2022-06-27 18:57:00 -05:00
parent 1d6ce15b3d
commit 48fa8935c3
46 changed files with 1756 additions and 1242 deletions
--- a/lib/include/lsocket.h
+++ b/lib/include/lsocket.h
@@ -4,57 +4,58 @@
 /* socket/winsock headers */
 #ifdef _WIN32
 /* windows */
-# ifndef NOMINMAX
-#  define NOMINMAX
-# endif
-# define _WINSOCK_DEPRECATED_NO_WARNINGS
-# include <winsock2.h>
-# include <windows.h>
-# include <ws2tcpip.h>
-# pragma comment(lib, "Ws2_32.lib")
+#    ifndef NOMINMAX
+#        define NOMINMAX
+#    endif
+#    define _WINSOCK_DEPRECATED_NO_WARNINGS
+#    include <windows.h>
+#    include <winsock2.h>
+#    include <ws2tcpip.h>
+#    pragma comment(lib, "Ws2_32.lib")

- typedef char buffer_t;
-# define PollFD WSAPOLLFD
-# define poll WSAPoll
-# define LN_ERRNO WSAGetLastError()
-# define LN_EWOULD WSAEWOULDBLOCK
-# define LN_MSG_NOSIGNAL 0
-# define SOCKETINVALID(x) (x == INVALID_SOCKET)
-# define SOCKETERROR(x) (x == SOCKET_ERROR)
+typedef char buffer_t;
+#    define PollFD           WSAPOLLFD
+#    define poll             WSAPoll
+#    define LN_ERRNO         WSAGetLastError()
+#    define LN_EWOULD        WSAEWOULDBLOCK
+#    define LN_MSG_NOSIGNAL  0
+#    define SOCKETINVALID(x) (x == INVALID_SOCKET)
+#    define SOCKETERROR(x)   (x == SOCKET_ERROR)
 #else
 /* posix platform */
-# include <sys/types.h>
-# include <sys/socket.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-# include <poll.h>
-# ifdef __linux__
-#  include <sys/epoll.h>
-  /* max events for epoll() */
-#  define MAX_EPOLL_EVENTS 128
-#  define LAIKA_USE_EPOLL
-# endif
-# include <unistd.h>
-# include <errno.h>
+#    include <arpa/inet.h>
+#    include <netdb.h>
+#    include <netinet/in.h>
+#    include <poll.h>
+#    include <sys/socket.h>
+#    include <sys/types.h>
+#    ifdef __linux__
+#        include <sys/epoll.h>
+/* max events for epoll() */
+#        define MAX_EPOLL_EVENTS 128
+#        define LAIKA_USE_EPOLL
+#    endif
+#    include <errno.h>
+#    include <unistd.h>

- typedef int SOCKET;
- typedef void buffer_t;
-# define PollFD struct pollfd
-# define LN_ERRNO errno
-# define LN_EWOULD EWOULDBLOCK
-# define LN_MSG_NOSIGNAL MSG_NOSIGNAL
-# define INVALID_SOCKET -1
-# define SOCKETINVALID(x) (x < 0)
-# define SOCKETERROR(x) (x == -1)
+typedef int SOCKET;
+typedef void buffer_t;
+#    define PollFD           struct pollfd
+#    define LN_ERRNO         errno
+#    define LN_EWOULD        EWOULDBLOCK
+#    define LN_MSG_NOSIGNAL  MSG_NOSIGNAL
+#    define INVALID_SOCKET   -1
+#    define SOCKETINVALID(x) (x < 0)
+#    define SOCKETERROR(x)   (x == -1)
 #endif
-#include <fcntl.h>
-#include <stdbool.h>
-
 #include "laika.h"
 #include "lsodium.h"

-typedef enum {
+#include <fcntl.h>
+#include <stdbool.h>
+
+typedef enum
+{
    RAWSOCK_OK,
    RAWSOCK_ERROR,
    RAWSOCK_CLOSED,
@@ -64,14 +65,15 @@ typedef enum {
 typedef bool (*pollEvent)(struct sLaika_socket *sock);
 typedef void (*pollFailEvent)(struct sLaika_socket *sock, void *uData);

-struct sLaika_socket {
+struct sLaika_socket
+{
    SOCKET sock; /* raw socket fd */
    pollFailEvent onPollFail;
    pollEvent onPollIn;
    pollEvent onPollOut;
-    void *uData; /* passed to onPollFail */
+    void *uData;     /* passed to onPollFail */
    uint8_t *outBuf; /* raw data to be sent() */
-    uint8_t *inBuf; /* raw data we recv()'d */
+    uint8_t *inBuf;  /* raw data we recv()'d */
    int outCount;
    int inCount;
    int outCap;
@@ -87,24 +89,31 @@ bool laikaS_isBigEndian(void);
 void laikaS_init(void);
 void laikaS_cleanUp(void);

-void laikaS_initSocket(struct sLaika_socket *sock, pollEvent onPollIn, pollEvent onPollOut, pollFailEvent onPollFail, void *uData);
+void laikaS_initSocket(struct sLaika_socket *sock, pollEvent onPollIn, pollEvent onPollOut,
+                       pollFailEvent onPollFail, void *uData);
 void laikaS_cleanSocket(struct sLaika_socket *sock);
-void laikaS_kill(struct sLaika_socket *sock); /* kills a socket */
+void laikaS_kill(struct sLaika_socket *sock);                          /* kills a socket */
 void laikaS_connect(struct sLaika_socket *sock, char *ip, char *port); /* connect to ip & port */
-void laikaS_bind(struct sLaika_socket *sock, uint16_t port); /* bind sock to port */
+void laikaS_bind(struct sLaika_socket *sock, uint16_t port);           /* bind sock to port */
 void laikaS_acceptFrom(struct sLaika_socket *sock, struct sLaika_socket *from, char *ipStr);
 bool laikaS_setNonBlock(struct sLaika_socket *sock);

-void laikaS_consumeRead(struct sLaika_socket *sock, size_t sz); /* throws sz bytes away from the inBuf */
-void laikaS_zeroWrite(struct sLaika_socket *sock, size_t sz); /* writes sz NULL bytes to the outBuf */
-void laikaS_read(struct sLaika_socket *sock, void *buf, size_t sz); /* reads from inBuf */
+void laikaS_consumeRead(struct sLaika_socket *sock,
+                        size_t sz); /* throws sz bytes away from the inBuf */
+void laikaS_zeroWrite(struct sLaika_socket *sock,
+                      size_t sz); /* writes sz NULL bytes to the outBuf */
+void laikaS_read(struct sLaika_socket *sock, void *buf, size_t sz);  /* reads from inBuf */
 void laikaS_write(struct sLaika_socket *sock, void *buf, size_t sz); /* writes to outBuf */
-void laikaS_writeKeyEncrypt(struct sLaika_socket *sock, void *buf, size_t sz, uint8_t *pub); /* encrypts & writes from buf using pub key */
-void laikaS_readKeyDecrypt(struct sLaika_socket *sock, void *buf, size_t sz, uint8_t *pub, uint8_t *priv); /* decrypts & reads to buf using pub & priv key*/
+void laikaS_writeKeyEncrypt(struct sLaika_socket *sock, void *buf, size_t sz,
+                            uint8_t *pub); /* encrypts & writes from buf using pub key */
+void laikaS_readKeyDecrypt(struct sLaika_socket *sock, void *buf, size_t sz, uint8_t *pub,
+                           uint8_t *priv); /* decrypts & reads to buf using pub & priv key*/
 void laikaS_writeByte(struct sLaika_socket *sock, uint8_t data);
 uint8_t laikaS_readByte(struct sLaika_socket *sock);
-void laikaS_readInt(struct sLaika_socket *sock, void *buf, size_t sz); /* reads INT, respecting endianness */
-void laikaS_writeInt(struct sLaika_socket *sock, void *buf, size_t sz); /* writes INT, respecting endianness */
+void laikaS_readInt(struct sLaika_socket *sock, void *buf,
+                    size_t sz); /* reads INT, respecting endianness */
+void laikaS_writeInt(struct sLaika_socket *sock, void *buf,
+                     size_t sz); /* writes INT, respecting endianness */

 RAWSOCKCODE laikaS_rawRecv(struct sLaika_socket *sock, size_t sz, int *processed);
 RAWSOCKCODE laikaS_rawSend(struct sLaika_socket *sock, size_t sz, int *processed);