update: add path section to MPTP packet

examples/client/install.c

@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
 
   printf("resolving package: %s (%s)...\n", pkg->data.name, pkg->data.version);
 
-  if ((list = lm_ctx_resolve(&ctx, pkg, NULL)) == NULL) {
+  if ((list = lm_ctx_resolve(&ctx, pkg, true, NULL)) == NULL) {
     printf("failed to resolve package: %s (%d)\n", lm_strerror(), lm_error());
     goto end;
   }

include/error.h

@@ -152,6 +152,7 @@ typedef enum lm_error {
   LM_ERR_MPTPListenFail        = 150,
   LM_ERR_PoolInfoBadName       = 151,
   LM_ERR_PoolInfoUnknown       = 152,
+  LM_ERR_MPTPBadPath           = 153,
 } lm_error_t;
 
 typedef struct lm_error_desc {

include/mptp.h

@@ -13,9 +13,12 @@
  #####################################
  #                FLAGS              #
  #####################################
- #    HOST SIZE    |    DATA SIZE    #
+ #    HOST SIZE    |    PATH SIZE    #
+ #####################################
+ #             DATA SIZE             #
  #####################################
  #                HOST               #
+ #                PATH               #
  #                DATA               #
  #...................................#
 
@@ -82,7 +85,8 @@
 
 #define MPTP_VERSION_SUPPORTED 0
 #define MPTP_CODE_MAX          3
-#define MPTP_DATA_MAX          UINT8_MAX
+#define MPTP_DATA_MAX          4096 // generally this is the page size on x86_64 linux
+#define MPTP_PATH_MAX          UINT8_MAX
 #define MPTP_HOST_MAX          UINT8_MAX
 #define MPTP_TIMEOUT           10
 
@@ -106,13 +110,13 @@ typedef enum lm_mptp_response {
 typedef struct lm_mptp_header {
   uint16_t flags;
   uint8_t  host_size;
-  uint8_t  data_size;
+  uint8_t  path_size;
+  uint16_t data_size;
 } __attribute__((packed)) lm_mptp_header_t;
 
 typedef struct lm_mptp {
   lm_mptp_header_t header;
-  char             host[MPTP_DATA_MAX];
+  char            *host, *path, *data;
-  char             data[MPTP_DATA_MAX];
 } lm_mptp_t;
 
 typedef bool (*lm_mptp_transfer_callback_t)(char *path, size_t current, size_t total, void *data);
@@ -125,17 +129,26 @@ typedef bool (*lm_mptp_transfer_callback_t)(char *path, size_t current, size_t t
 #define MPTP_IS_REQUEST(m) (MPTP_FLAGS_TYPE(m) == 0)
 #define MPTP_IS_LAST(m)    (MPTP_FLAGS_LAST(m) == 1)
 
-bool lm_mptp_init(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last);
+void lm_mptp_init(lm_mptp_t *packet);
-bool lm_mptp_set_data(lm_mptp_t *packet, char *data, size_t size);
+bool lm_mptp_new(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last);
-bool lm_mptp_set_host(lm_mptp_t *packet, char *host);
+void lm_mptp_free(lm_mptp_t *packet);
-bool lm_mptp_get_host(lm_mptp_t *packet, char *host);
+
-bool lm_mptp_get_data(lm_mptp_t *packet, char *data);
 int  lm_mptp_socket(char *addr, uint16_t port, struct sockaddr *saddr);
 bool lm_mptp_socket_opts(int sock);
 void lm_mptp_copy(lm_mptp_t *dst, lm_mptp_t *src);
 bool lm_mptp_verify(lm_mptp_t *packet);
 void lm_mptp_close(int sock);
 bool lm_mptp_recv(int sock, lm_mptp_t *packet);
+void lm_mptp_free(lm_mptp_t *packet);
+
+bool lm_mptp_set_data(lm_mptp_t *packet, char *data, size_t size);
+bool lm_mptp_get_data(lm_mptp_t *packet, char *data);
+
+bool lm_mptp_set_host(lm_mptp_t *packet, char *host);
+bool lm_mptp_get_host(lm_mptp_t *packet, char *host);
+
+bool lm_mptp_set_path(lm_mptp_t *packet, char *path);
+bool lm_mptp_get_path(lm_mptp_t *packet, char *path);
 
 int  lm_mptp_client_connect(char *addr, uint16_t port);
 bool lm_mptp_client_verify(lm_mptp_t *packet);

include/util.h

@@ -30,6 +30,7 @@ bool  exists(char *path, struct stat *st);
 bool  is_empty(char *p);
 bool  is_dir_empty(char *p);
 bool  rmrf(char *p);
+int   digits(int n);
 
 bool package_parse(char *package, char *name, char *version);
 bool package_version_valid(char *name);

locale/tr/LC_MESSAGES/libmp.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-09 03:32+0300\n"
+"POT-Creation-Date: 2024-08-09 22:12+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -121,534 +121,539 @@ msgid "MPTP host size is invalid"
 msgstr "URL path is too large"
 
 #: src/error.c:43
+#, fuzzy
+msgid "MPTP path size is invalid"
+msgstr "URL path is too large"
+
+#: src/error.c:44
 msgid "failed to set MPTP socket options"
 msgstr ""
 
-#: src/error.c:44
+#: src/error.c:45
 msgid "MPTP connection timed out"
 msgstr ""
 
-#: src/error.c:45
+#: src/error.c:46
 #, c-format
 msgid "failed to bind MPTP socket: %s"
 msgstr ""
 
-#: src/error.c:46
+#: src/error.c:47
 msgid "required argument is a NULL pointer or 0"
 msgstr ""
 
-#: src/error.c:47
+#: src/error.c:48
 msgid "not a MPTP request"
 msgstr ""
 
-#: src/error.c:48
+#: src/error.c:49
 msgid "not a MPTP response"
 msgstr ""
 
-#: src/error.c:49 src/error.c:50
+#: src/error.c:50 src/error.c:51
 msgid "MPTP request last flag is not set"
 msgstr ""
 
-#: src/error.c:51
+#: src/error.c:52
 msgid "host port not specified"
 msgstr ""
 
-#: src/error.c:52
+#: src/error.c:53
 msgid "pool info is badly formatted or is not complete"
 msgstr ""
 
-#: src/error.c:53
+#: src/error.c:54
 msgid "failed to write block from archive"
 msgstr ""
 
-#: src/error.c:54
+#: src/error.c:55
 msgid "failed to read block from archive"
 msgstr ""
 
-#: src/error.c:55
+#: src/error.c:56
 msgid "failed to open archive"
 msgstr ""
 
-#: src/error.c:56
+#: src/error.c:57
 msgid "failed to write archive header"
 msgstr ""
 
-#: src/error.c:57
+#: src/error.c:58
 msgid "failed to finish writing the archive entry"
 msgstr ""
 
-#: src/error.c:58
+#: src/error.c:59
 msgid "failed to create new archive reader/writer"
 msgstr ""
 
-#: src/error.c:59
+#: src/error.c:60
 msgid "failed to resolve full path for archive file"
 msgstr ""
 
-#: src/error.c:60
+#: src/error.c:61
 msgid "failed to read the next header of the archive"
 msgstr ""
 
-#: src/error.c:61
+#: src/error.c:62
 msgid "failed to obtain current working directory"
 msgstr ""
 
-#: src/error.c:62
+#: src/error.c:63
 msgid "failed to open extracted pool list directory"
 msgstr ""
 
-#: src/error.c:63
+#: src/error.c:64
 msgid "failed to read access the pool list file"
 msgstr ""
 
-#: src/error.c:64
+#: src/error.c:65
 msgid "failed to read access the pool info file"
 msgstr ""
 
-#: src/error.c:65
+#: src/error.c:66
 msgid "failed to parse package data"
 msgstr ""
 
-#: src/error.c:66
+#: src/error.c:67
 #, fuzzy
 msgid "package name is invalid"
 msgstr "URL hostname is too large"
 
-#: src/error.c:67
+#: src/error.c:68
 msgid "data path is not set with in the ctx"
 msgstr ""
 
-#: src/error.c:68
+#: src/error.c:69
 msgid "temp path is not set with in the ctx"
 msgstr ""
 
-#: src/error.c:69
-msgid "root path is not set with in the ctx"
-msgstr ""
-
 #: src/error.c:70
-#, c-format
+msgid "root path is not set with in the ctx"
-msgid "failed to set the ctx temp director to %s: %s"
 msgstr ""
 
 #: src/error.c:71
 #, c-format
-msgid "failed to set the ctx root directory to %s: %s"
+msgid "failed to set the ctx temp director to %s: %s"
 msgstr ""
 
 #: src/error.c:72
 #, c-format
-msgid "failed to set the ctx data directory to %s: %s"
+msgid "failed to set the ctx root directory to %s: %s"
 msgstr ""
 
 #: src/error.c:73
-msgid "pool did not respond ping with pong"
+#, c-format
+msgid "failed to set the ctx data directory to %s: %s"
 msgstr ""
 
 #: src/error.c:74
-msgid "package file and directory paths are empty"
+msgid "pool did not respond ping with pong"
 msgstr ""
 
 #: src/error.c:75
-msgid "failed to to open target file for sending"
+msgid "package file and directory paths are empty"
 msgstr ""
 
 #: src/error.c:76
-msgid "failed to to delete target file for receiving"
+msgid "failed to to open target file for sending"
 msgstr ""
 
 #: src/error.c:77
-msgid "failed to to open target file for receiving"
+msgid "failed to to delete target file for receiving"
 msgstr ""
 
 #: src/error.c:78
-msgid "got a bad response code for receiving the target file"
+msgid "failed to to open target file for receiving"
 msgstr ""
 
 #: src/error.c:79
-msgid "failed to write to the target file for receiving"
+msgid "got a bad response code for receiving the target file"
 msgstr ""
 
 #: src/error.c:80
+msgid "failed to write to the target file for receiving"
+msgstr ""
+
+#: src/error.c:81
 #, fuzzy
 msgid "package not found"
 msgstr "URL hostname is too large"
 
-#: src/error.c:81
+#: src/error.c:82
 msgid "failed to access to the database file/directory"
 msgstr ""
 
-#: src/error.c:82
+#: src/error.c:83
 msgid "failed to open SQLite database"
 msgstr ""
 
-#: src/error.c:83
+#: src/error.c:84
 msgid "failed to create table in SQLite database"
 msgstr ""
 
-#: src/error.c:84
+#: src/error.c:85
 msgid "failed to prepare statement for SQLite database"
 msgstr ""
 
-#: src/error.c:85
+#: src/error.c:86
 msgid "failed to insert to the table in SQLite database"
 msgstr ""
 
-#: src/error.c:86
+#: src/error.c:87
 msgid "failed to select from the table in SQLite database"
 msgstr ""
 
-#: src/error.c:87
+#: src/error.c:88
 msgid "failed to delete from the table in SQLite database"
 msgstr ""
 
-#: src/error.c:88
+#: src/error.c:89
 msgid "failed to find entry in SQLite database"
 msgstr ""
 
-#: src/error.c:89
+#: src/error.c:90
 msgid "failed to init GPG for package verification"
 msgstr ""
 
-#: src/error.c:90
+#: src/error.c:91
 msgid "failed to import signature to GPG for package verification"
 msgstr ""
 
-#: src/error.c:91
+#: src/error.c:92
 msgid "failed to import archive to GPG for package verification"
 msgstr ""
 
-#: src/error.c:92
+#: src/error.c:93
 msgid "package signature verification failed with zero matches"
 msgstr ""
 
-#: src/error.c:93
+#: src/error.c:94
 msgid "package signature verification failed with zero results"
 msgstr ""
 
-#: src/error.c:94
+#: src/error.c:95
 msgid "pool file and directory paths are empty"
 msgstr ""
 
-#: src/error.c:95
+#: src/error.c:96
 msgid "pool is not avaliable for connection"
 msgstr ""
 
-#: src/error.c:96
+#: src/error.c:97
 msgid "pool URL is empty or invalid"
 msgstr ""
 
-#: src/error.c:97
+#: src/error.c:98
 msgid "pool directory path is not accessible"
 msgstr ""
 
-#: src/error.c:98
+#: src/error.c:99
 msgid "pool directory sub-paths are not accessible"
 msgstr ""
 
-#: src/error.c:99
+#: src/error.c:100
 msgid "package file list not found in the database"
 msgstr ""
 
-#: src/error.c:100
+#: src/error.c:101
 msgid "failed to open package file list in the database"
 msgstr ""
 
-#: src/error.c:101
+#: src/error.c:102
 msgid "failed to access package file list database directory"
 msgstr ""
 
-#: src/error.c:102
+#: src/error.c:103
 msgid "failed to remove package file list from the database"
 msgstr ""
 
-#: src/error.c:103
+#: src/error.c:104
 msgid "failed to write to the file list in the database"
 msgstr ""
 
-#: src/error.c:104
+#: src/error.c:105
 msgid "package keep list not found in the database"
 msgstr ""
 
-#: src/error.c:105
+#: src/error.c:106
 msgid "failed to open package keep list in the database"
 msgstr ""
 
-#: src/error.c:106
+#: src/error.c:107
 msgid "failed to access package keep list database directory"
 msgstr ""
 
-#: src/error.c:107
-msgid "failed to remove package keep list from the database"
-msgstr ""
-
 #: src/error.c:108
-#, c-format
+msgid "failed to remove package keep list from the database"
-msgid "failed to find %s (dependency of %s)"
 msgstr ""
 
 #: src/error.c:109
 #, c-format
-msgid "failed to download %s for installation: %s"
+msgid "failed to find %s (dependency of %s)"
 msgstr ""
 
 #: src/error.c:110
+#, c-format
+msgid "failed to download %s for installation: %s"
+msgstr ""
+
+#: src/error.c:111
 #, fuzzy
 msgid "package is not downloaded"
 msgstr "URL hostname is too large"
 
-#: src/error.c:111 src/error.c:112
+#: src/error.c:112 src/error.c:113
 msgid "failed to remove downloaded package"
 msgstr ""
 
-#: src/error.c:113
+#: src/error.c:114
 msgid "failed to open the destination file"
 msgstr ""
 
-#: src/error.c:114
+#: src/error.c:115
 msgid "failed to open the source file"
 msgstr ""
 
-#: src/error.c:115 src/error.c:116
+#: src/error.c:116 src/error.c:117
 msgid "failed to write to the destination file"
 msgstr ""
 
-#: src/error.c:117
+#: src/error.c:118
 msgid "package does not have associated pool"
 msgstr ""
 
-#: src/error.c:118
+#: src/error.c:119
 msgid "failed to create specified temp directory"
 msgstr ""
 
-#: src/error.c:119
+#: src/error.c:120
 msgid "package archive does not contain required files"
 msgstr ""
 
-#: src/error.c:120
+#: src/error.c:121
 msgid "package data does not match with target package"
 msgstr ""
 
-#: src/error.c:121
+#: src/error.c:122
 #, c-format
 msgid "failed to update changes file for package: %s"
 msgstr ""
 
-#: src/error.c:122
+#: src/error.c:123
 msgid "failed to access package hashes file"
 msgstr ""
 
-#: src/error.c:123
+#: src/error.c:124
 msgid "failed to remove package changes file from the database"
 msgstr ""
 
-#: src/error.c:124
+#: src/error.c:125
 msgid "failed to stat target file for sending"
 msgstr ""
 
-#: src/error.c:125
+#: src/error.c:126
 msgid "failed to format target file size for sending"
 msgstr ""
 
-#: src/error.c:126
+#: src/error.c:127
 msgid "failed to read target file size for sending"
 msgstr ""
 
-#: src/error.c:127
+#: src/error.c:128
 msgid "failed to parse target file size for receiving"
 msgstr ""
 
-#: src/error.c:128
+#: src/error.c:129
 msgid "target file is not fully received"
 msgstr ""
 
-#: src/error.c:129
-msgid "failed to stat for target extract archive"
-msgstr ""
-
 #: src/error.c:130
-#, c-format
+msgid "failed to stat for target extract archive"
-msgid "failed to add package file (%s) to the database: %s"
 msgstr ""
 
 #: src/error.c:131
 #, c-format
-msgid "failed to extract package files: %s"
+msgid "failed to add package file (%s) to the database: %s"
 msgstr ""
 
 #: src/error.c:132
 #, c-format
-msgid "failed to add package to the database: %s"
+msgid "failed to extract package files: %s"
 msgstr ""
 
 #: src/error.c:133
+#, c-format
+msgid "failed to add package to the database: %s"
+msgstr ""
+
+#: src/error.c:134
 #, fuzzy
 msgid "package is already installed"
 msgstr "URL hostname is too large"
 
-#: src/error.c:134
+#: src/error.c:135
 #, fuzzy
 msgid "package is not installed"
 msgstr "URL hostname is too large"
 
-#: src/error.c:135
+#: src/error.c:136
 #, c-format
 msgid "failed to remove package file (%s): %s"
 msgstr ""
 
-#: src/error.c:136
+#: src/error.c:137
 #, c-format
 msgid "failed to remove package from the database: %s"
 msgstr ""
 
-#: src/error.c:137
+#: src/error.c:138
 #, c-format
 msgid "failed to remove package files from the database: %s"
 msgstr ""
 
-#: src/error.c:138
+#: src/error.c:139
 #, c-format
 msgid "failed to remove changes file for package: %s"
 msgstr ""
 
-#: src/error.c:139
+#: src/error.c:140
 msgid "failed to get current directory for running install"
 msgstr ""
 
-#: src/error.c:140
+#: src/error.c:141
 msgid "failed change directory to root for running install"
 msgstr ""
 
-#: src/error.c:141
+#: src/error.c:142
 msgid "failed run install spawn command"
 msgstr ""
 
-#: src/error.c:143
+#: src/error.c:144
 msgid "failed to change directory to old directory after running install"
 msgstr ""
 
-#: src/error.c:144
-msgid "install script returned a bad status code"
-msgstr ""
-
 #: src/error.c:145
-#, c-format
+msgid "install script returned a bad status code"
-msgid "failed to run the package install script: %s"
 msgstr ""
 
 #: src/error.c:146
 #, c-format
-msgid "failed to save the package install script: %s"
+msgid "failed to run the package install script: %s"
 msgstr ""
 
 #: src/error.c:147
 #, c-format
-msgid "removing package breaks %s"
+msgid "failed to save the package install script: %s"
 msgstr ""
 
 #: src/error.c:148
+#, c-format
+msgid "removing package breaks %s"
+msgstr ""
+
+#: src/error.c:149
 #, fuzzy
 msgid "package is already up-to-date"
 msgstr "URL hostname is too large"
 
-#: src/error.c:149
+#: src/error.c:150
 msgid "failed to open file for hashing"
 msgstr ""
 
-#: src/error.c:150
-msgid "failed create digest for hashing"
-msgstr ""
-
 #: src/error.c:151
-#, c-format
+msgid "failed create digest for hashing"
-msgid "failed to get hash of %s: %s"
 msgstr ""
 
 #: src/error.c:152
 #, c-format
-msgid "file hash does not match for %s"
+msgid "failed to get hash of %s: %s"
 msgstr ""
 
 #: src/error.c:153
+#, c-format
+msgid "file hash does not match for %s"
+msgstr ""
+
+#: src/error.c:154
 #, fuzzy
 msgid "pool info is not loaded"
 msgstr "URL hostname is too large"
 
-#: src/error.c:154
+#: src/error.c:155
 msgid "pool list is empty"
 msgstr ""
 
-#: src/error.c:155
+#: src/error.c:156
 msgid "package changes file not found in the database"
 msgstr ""
 
-#: src/error.c:156
+#: src/error.c:157
 msgid "failed to change mod of the changes file"
 msgstr ""
 
-#: src/error.c:157
+#: src/error.c:158
 msgid "failed to create install script save directory"
 msgstr ""
 
-#: src/error.c:158
+#: src/error.c:159
 msgid "directory does not have write permissions"
 msgstr ""
 
-#: src/error.c:159
+#: src/error.c:160
 msgid "specified path is not a directory"
 msgstr ""
 
-#: src/error.c:160
+#: src/error.c:161
 msgid "failed to create the specified directory"
 msgstr ""
 
-#: src/error.c:161
-msgid "specified list extraction directory is not accessible"
-msgstr ""
-
 #: src/error.c:162
-#, c-format
+msgid "specified list extraction directory is not accessible"
-msgid "file does not exist: %s"
 msgstr ""
 
 #: src/error.c:163
 #, c-format
-msgid "file is a symbolic link: %s"
+msgid "file does not exist: %s"
 msgstr ""
 
 #: src/error.c:164
-msgid "failed to set the package archive"
+#, c-format
+msgid "file is a symbolic link: %s"
 msgstr ""
 
 #: src/error.c:165
+msgid "failed to set the package archive"
+msgstr ""
+
+#: src/error.c:166
 #, c-format
 msgid "failed change directory: %s"
 msgstr ""
 
-#: src/error.c:166
+#: src/error.c:167
 msgid "failed to change directory to root during extraction"
 msgstr ""
 
-#: src/error.c:167
-msgid "failed to change directory back from root during extraction"
-msgstr ""
-
 #: src/error.c:168
-#, c-format
+msgid "failed to change directory back from root during extraction"
-msgid "failed to accept the MPTP connection: %s"
 msgstr ""
 
 #: src/error.c:169
 #, c-format
-msgid "failed to listen the MPTP socket: %s"
+msgid "failed to accept the MPTP connection: %s"
 msgstr ""
 
 #: src/error.c:170
 #, c-format
-msgid "pool name (%s) doesn't match with: %s"
+msgid "failed to listen the MPTP socket: %s"
 msgstr ""
 
 #: src/error.c:171
 #, c-format
+msgid "pool name (%s) doesn't match with: %s"
+msgstr ""
+
+#: src/error.c:172
+#, c-format
 msgid "unknown key in the configuration: %s"
 msgstr ""

src/ctx/download.c

@@ -65,9 +65,9 @@ bool lm_ctx_download(lm_ctx_t *ctx, lm_pkg_t *pkg, lm_ctx_download_callback_t ca
   if((sock = lm_mptp_client_connect(pool->url.host, pool->url.port)) < 0)
     return false;
 
-  lm_mptp_init(&packet, true, MPTP_C2S_PULL, true);
+  lm_mptp_new(&packet, true, MPTP_C2S_PULL, true);
   lm_mptp_set_host(&packet, pool->url.host);
-  lm_mptp_set_data(&packet, path, strlen(path));
+  lm_mptp_set_path(&packet, path);
 
   if(!lm_mptp_client_send(sock, &packet))
     goto end;
@@ -83,6 +83,7 @@ bool lm_ctx_download(lm_ctx_t *ctx, lm_pkg_t *pkg, lm_ctx_download_callback_t ca
 
   ret = true;
 end:
+  lm_mptp_free(&packet);
   lm_mptp_close(sock);
   return ret;
 }

src/ctx/serve.c

@@ -28,6 +28,9 @@ void __lm_ctx_serve_thread(void *_arg) {
   bool success = false;
   lm_mptp_t packet;
 
+  lm_mptp_init(&packet);
+  lm_error_clear();
+
   if(!lm_mptp_server_recv(arg->sock, &packet)){
     pdebug(__func__, "%x: failed to receive packet (%s)", arg->addr, lm_strerror());
     return lm_mptp_close(arg->sock);
@@ -39,14 +42,14 @@ void __lm_ctx_serve_thread(void *_arg) {
   }
 
   char hostname[packet.header.host_size + 1]; // +1 for NULL terminator
-  char path[packet.header.data_size + 1], *ppath = path;
+  char path[packet.header.path_size + 1], *ppath = path;
 
   if (!lm_mptp_get_host(&packet, hostname)) {
     pdebug(__func__, "%x: closing connection, failed to get hostname (%s)", arg->addr, lm_strerror());
     goto end;
   }
 
-  if (!lm_mptp_get_data(&packet, path)) {
+  if (!lm_mptp_get_path(&packet, path)) {
     pdebug(__func__, "%x: closing connection, failed to get path (%s)", arg->addr, lm_strerror());
     goto end;
   }
@@ -60,21 +63,21 @@ void __lm_ctx_serve_thread(void *_arg) {
 
   if (NULL == pool) {
     pdebug(__func__, "%x: unknown pool (%s), closing connection", arg->addr, hostname);
-    lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
+    lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
     lm_mptp_server_send(arg->sock, &packet);
     goto end;
   }
 
   if(lm_pool_path_is_empty(pool)){
     pdebug(__func__, "%x: requested pool (%s) have empty paths, closing connection", arg->addr, pool->name);
-    lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
+    lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
     lm_mptp_server_send(arg->sock, &packet);
     goto end;
   }
 
   if(!pool->loaded){
     pdebug(__func__, "%x: requested pool (%s) is not loaded, closing connection", arg->addr, pool->name);
-    lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
+    lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
     lm_mptp_server_send(arg->sock, &packet);
     goto end;
   }
@@ -85,7 +88,7 @@ void __lm_ctx_serve_thread(void *_arg) {
   // response PING with PONG
   case MPTP_C2S_PING:
     pdebug(__func__, "PING %s: returning PONG", pool->name);
-    lm_mptp_init(&packet, false, MPTP_S2C_PONG, true);
+    lm_mptp_new(&packet, false, MPTP_S2C_PONG, true);
     lm_mptp_server_send(arg->sock, &packet);
     break;
 
@@ -106,16 +109,16 @@ void __lm_ctx_serve_thread(void *_arg) {
   case MPTP_C2S_PULL:
     // PULL request should contain package path,
     // if path (stored in the data field) is empty it's an invalid request
-    if(packet.header.data_size <= 0){
+    if(packet.header.path_size <= 0){
-      lm_mptp_init(&packet, false, MPTP_S2C_WHAT, true);
+      lm_mptp_new(&packet, false, MPTP_S2C_WHAT, true);
       lm_mptp_server_send(arg->sock, &packet);
       break;
     }
 
     pdebug(__func__, "PULL %s: attempting to send package archive and signature", pool->name);
-    char path[packet.header.data_size + 1], *package = path;
+    char path[packet.header.path_size + 1], *package = path;
 
-    if(!lm_mptp_get_data(&packet, path)){
+    if(!lm_mptp_get_path(&packet, path)){
       // we should never be able to get here, if we do theres definetly a bug
       pdebug(__func__, "PULL %s: skipping, failed to get path (%s)", pool->name, lm_strerror());
       break;
@@ -123,7 +126,7 @@ void __lm_ctx_serve_thread(void *_arg) {
 
     // if we can't get the package name, then theres something wrong with the request
     if((package = basename(path)) == NULL){
-      lm_mptp_init(&packet, false, MPTP_S2C_WHAT, true);
+      lm_mptp_new(&packet, false, MPTP_S2C_WHAT, true);
       lm_mptp_server_send(arg->sock, &packet);
       break;
     }
@@ -134,14 +137,14 @@ void __lm_ctx_serve_thread(void *_arg) {
 
     // if we can't parse the package name, request is invalid
     if(!package_parse(package, name, version)){
-      lm_mptp_init(&packet, false, MPTP_S2C_WHAT, true);
+      lm_mptp_new(&packet, false, MPTP_S2C_WHAT, true);
       lm_mptp_server_send(arg->sock, &packet);
       break;
     }
 
     // if the package is not found in the pool, tell the client
     if((pkg = lm_pool_package_find(pool, name, version)) == NULL){
-      lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
+      lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
       lm_mptp_server_send(arg->sock, &packet);
       break;
     }

src/error.c

@@ -40,6 +40,7 @@ void lm_error_set(lm_error_t code, ...) {
       {.code = LM_ERR_MPTPSendFail,            .desc = _("failed send MPTP data to host")                              },
       {.code = LM_ERR_MPTPBadData,             .desc = _("MPTP data size is invalid")                                  },
       {.code = LM_ERR_MPTPBadHost,             .desc = _("MPTP host size is invalid")                                  },
+      {.code = LM_ERR_MPTPBadPath,             .desc = _("MPTP path size is invalid")                                  },
       {.code = LM_ERR_MPTPSetsockopt,          .desc = _("failed to set MPTP socket options")                          },
       {.code = LM_ERR_MPTPTimeout,             .desc = _("MPTP connection timed out")                                  },
       {.code = LM_ERR_MPTPBindFail,            .desc = _("failed to bind MPTP socket: %s")                             },

src/mptp/client.c

@@ -28,15 +28,19 @@ int lm_mptp_client_connect(char *addr, uint16_t port) {
 }
 
 bool lm_mptp_client_verify(lm_mptp_t *packet) {
-  if (!lm_mptp_verify(packet))
+  if (!lm_mptp_verify(packet)){
+    pdebug(__func__, "failed to verify the packet: %s", lm_strerror());
     return false;
+  }
 
   if (MPTP_IS_REQUEST(packet)) {
+    pdebug(__func__, "MPTP packet is a request");
     lm_error_set(LM_ERR_MPTPNotResponse);
     return false;
   }
 
   if (packet->header.host_size != 0) {
+    pdebug(__func__, "MPTP response has host section");
     lm_error_set(LM_ERR_MPTPBadHost);
     return false;
   }
@@ -47,42 +51,59 @@ bool lm_mptp_client_verify(lm_mptp_t *packet) {
 bool lm_mptp_client_send(int sock, lm_mptp_t *packet) {
   if (NULL == packet) {
     lm_error_set(LM_ERR_ArgNULL);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (MPTP_FLAGS_VERSION(packet) != MPTP_VERSION_SUPPORTED) {
     lm_error_set(LM_ERR_MPTPBadVersion);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (packet->header.data_size > MPTP_DATA_MAX) {
     lm_error_set(LM_ERR_MPTPBadData);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size <= 0) {
     lm_error_set(LM_ERR_MPTPBadHost);
+    lm_mptp_free(packet);
     return false;
   }
 
-  char    buffer[sizeof(packet->header) + packet->header.host_size + packet->header.data_size];
+  char      buffer[
+    sizeof(packet->header) + 
+    packet->header.host_size + 
+    packet->header.path_size + 
+    packet->header.data_size
+  ];
   ssize_t total = sizeof(buffer), used = 0, buflen = total;
-
+  bool ret = false;
-  packet->header.flags = htons(packet->header.flags);
 
   copy_to_buffer(buffer, &packet->header, sizeof(packet->header), &total, &used);
   copy_to_buffer(buffer, packet->host, packet->header.host_size, &total, &used);
+  copy_to_buffer(buffer, packet->path, packet->header.path_size, &total, &used);
   copy_to_buffer(buffer, packet->data, packet->header.data_size, &total, &used);
   
+  packet->header.flags = htons(packet->header.flags);
+  //packet->header.host_size = htons(packet->header.host_size);
+  //packet->header.path_size = htons(packet->header.path_size);
+  packet->header.data_size = htons(packet->header.data_size);
+ 
   if (send(sock, buffer, sizeof(buffer), MSG_MORE) < 0) {
     lm_error_set(LM_ERR_MPTPSendFail);
-    return false;
+    goto end;
   }
 
   pdebug(__func__, "printing the packet dump (%lu bytes)", buflen);
   pdebug_binary(buffer, buflen);
+  ret = true;
 
-  return true;
+end:
+  lm_mptp_free(packet);
+  return ret;
 }
 
 bool lm_mptp_client_recv(int sock, lm_mptp_t *packet) {
@@ -91,7 +112,7 @@ bool lm_mptp_client_recv(int sock, lm_mptp_t *packet) {
     return false;
   }
 
-  bzero(packet, sizeof(lm_mptp_t));
+  lm_mptp_free(packet);
 
   if(!lm_mptp_recv(sock, packet)){
     pdebug(__func__, "failed to receive the packet: %s", lm_strerror());

src/mptp/mptp.c

@@ -5,13 +5,17 @@
 #include <errno.h>
 #include <netinet/tcp.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-bool lm_mptp_init(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last) {
+void lm_mptp_init(lm_mptp_t *packet){
-  bzero(&packet->header, sizeof(packet->header));
+  bzero(packet, sizeof(lm_mptp_t));
-  bzero(packet->data, MPTP_DATA_MAX);
+}
-  bzero(packet->host, MPTP_HOST_MAX);
+
+bool lm_mptp_new(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last) {
+  lm_mptp_init(packet);
 
   if (code > MPTP_CODE_MAX) {
     lm_error_set(LM_ERR_MPTPBadCode);
@@ -35,6 +39,17 @@ bool lm_mptp_init(lm_mptp_t *packet, bool is_request, uint8_t code, bool is_last
   return true;
 }
 
+void lm_mptp_free(lm_mptp_t *packet) {
+  if(NULL == packet)
+    return;
+
+  free(packet->host);
+  free(packet->path);
+  free(packet->data);
+
+  lm_mptp_init(packet);
+}
+
 bool lm_mptp_verify(lm_mptp_t *packet) {
   if (NULL == packet) {
     lm_error_set(LM_ERR_ArgNULL);
@@ -46,6 +61,16 @@ bool lm_mptp_verify(lm_mptp_t *packet) {
     return false;
   }
 
+  if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size < 0) {
+    lm_error_set(LM_ERR_MPTPBadHost);
+    return false;
+  }
+
+ if (packet->header.path_size > MPTP_PATH_MAX || packet->header.path_size < 0) {
+    lm_error_set(LM_ERR_MPTPBadPath);
+    return false;
+  }
+
   if (packet->header.data_size > MPTP_DATA_MAX || packet->header.data_size < 0) {
     lm_error_set(LM_ERR_MPTPBadData);
     return false;
@@ -161,9 +186,13 @@ bool lm_mptp_set_host(lm_mptp_t *packet, char *host) {
     return false;
   }
 
+  free(packet->host);
+  packet->host = malloc(size);
+
   // do NOT copy the NULL terminator
   packet->header.host_size = size;
   memcpy(packet->host, host, size);
+
   return true;
 }
 
@@ -179,14 +208,49 @@ bool lm_mptp_get_host(lm_mptp_t *packet, char *host) {
   return true;
 }
 
+bool lm_mptp_set_path(lm_mptp_t *packet, char *path) {
+  size_t size = strlen(path);
+  if (size > MPTP_PATH_MAX || size < 0) {
+    lm_error_set(LM_ERR_MPTPBadHost);
+    return false;
+  }
+
+  free(packet->path);
+  packet->path = malloc(size);
+
+  // do NOT copy the NULL terminator
+  packet->header.path_size = size;
+  memcpy(packet->path, path, size);
+
+  return true;
+}
+
+bool lm_mptp_get_path(lm_mptp_t *packet, char *path) {
+  if (packet->header.path_size > MPTP_PATH_MAX || packet->header.path_size < 0) {
+    path = NULL;
+    lm_error_set(LM_ERR_BadHost);
+    return false;
+  }
+
+  memcpy(path, packet->path, packet->header.path_size);
+  path[packet->header.path_size] = 0;
+  return true;
+}
+
 bool lm_mptp_set_data(lm_mptp_t *packet, char *data, size_t size) {
   if (size > MPTP_DATA_MAX || size < 0) {
     lm_error_set(LM_ERR_MPTPBadData);
     return false;
   }
 
+  free(packet->data);
+  packet->data = malloc(size);
+
+  if(NULL != data){
     packet->header.data_size = size;
     mempcpy(packet->data, data, size);
+  }
+
   return true;
 }
 
@@ -202,12 +266,6 @@ bool lm_mptp_get_data(lm_mptp_t *packet, char *data) {
   return true;
 }
 
-void lm_mptp_copy(lm_mptp_t *dst, lm_mptp_t *src) {
-  memcpy(&dst->header, &src->header, sizeof(dst->header));
-  memcpy(&dst->host, &src->data, sizeof(src->host));
-  memcpy(&dst->data, &src->data, sizeof(src->data));
-}
-
 bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
   if (recv(sock, &packet->header, sizeof(packet->header), MSG_WAITALL) <= 0) {
     if (ETIMEDOUT == errno || EAGAIN == errno) {
@@ -218,11 +276,13 @@ bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
     return false;
   }
   
-  packet->header.flags = ntohs(packet->header.flags);
+  /*packet->header.flags     = ntohs(packet->header.flags);
-  // packet->header.host_size  = ntohs(packet->header.host_size);
+  packet->header.host_size = ntohs(packet->header.host_size);
-  // packet->header.data_size  = ntohs(packet->header.data_size);
+  packet->header.path_size = ntohs(packet->header.path_size);
+  packet->header.data_size = ntohs(packet->header.data_size);*/
 
   if (packet->header.host_size <= MPTP_HOST_MAX && packet->header.host_size != 0){
+    packet->host = malloc(packet->header.host_size);
     if(recv(sock, packet->host, packet->header.host_size, MSG_WAITALL) <= 0){
       if (ETIMEDOUT == errno || EAGAIN == errno) {
         lm_error_set(LM_ERR_MPTPTimeout);
@@ -233,7 +293,20 @@ bool lm_mptp_recv(int sock, lm_mptp_t *packet) {
     }
   }
 
+  if (packet->header.path_size <= MPTP_PATH_MAX && packet->header.path_size != 0){
+    packet->path = malloc(packet->header.path_size);
+    if(recv(sock, packet->path, packet->header.path_size, MSG_WAITALL) <= 0){
+      if (ETIMEDOUT == errno || EAGAIN == errno) {
+        lm_error_set(LM_ERR_MPTPTimeout);
+        return false;
+      }
+      lm_error_set(LM_ERR_MPTPRecvFail, strerror(errno));
+      return false;
+    }
+  }
+
   if (packet->header.data_size <= MPTP_DATA_MAX && packet->header.data_size != 0){
+    packet->data = malloc(packet->header.data_size);
     if(recv(sock, packet->data, packet->header.data_size, MSG_WAITALL) <= 0){
       if (ETIMEDOUT == errno || EAGAIN == errno) {
         lm_error_set(LM_ERR_MPTPTimeout);

src/mptp/server.c

@@ -53,20 +53,19 @@ void lm_mptp_server_close(int sock){
 }
 
 bool lm_mptp_server_verify(lm_mptp_t *packet) {
-  if (!lm_mptp_verify(packet))
+  if (!lm_mptp_verify(packet)){
+    pdebug(__func__, "failed to verify the packet: %s", lm_strerror());
     return false;
+  }
 
   if (!MPTP_IS_REQUEST(packet)) {
+    pdebug(__func__, "MPTP packet is not request");
     lm_error_set(LM_ERR_MPTPNotRequest);
     return false;
   }
 
-  if (packet->header.host_size > MPTP_HOST_MAX || packet->header.host_size <= 0) {
-    lm_error_set(LM_ERR_MPTPBadHost);
-    return false;
-  }
-
   if (!MPTP_IS_LAST(packet)) {
+    pdebug(__func__, "MPTP packet is not the last");
     lm_error_set(LM_ERR_MPTPNotLast);
     return false;
   }
@@ -80,7 +79,7 @@ bool lm_mptp_server_recv(int sock, lm_mptp_t *packet) {
     return false;
   }
 
-  bzero(packet, sizeof(lm_mptp_t));
+  lm_mptp_free(packet);
 
   if(!lm_mptp_recv(sock, packet)){
     pdebug(__func__, "failed to receive the packet: %s", lm_strerror());
@@ -93,40 +92,57 @@ bool lm_mptp_server_recv(int sock, lm_mptp_t *packet) {
 bool lm_mptp_server_send(int sock, lm_mptp_t *packet) {
   if (NULL == packet) {
     lm_error_set(LM_ERR_ArgNULL);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (MPTP_FLAGS_VERSION(packet) != MPTP_VERSION_SUPPORTED) {
     lm_error_set(LM_ERR_MPTPBadVersion);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (packet->header.data_size > MPTP_DATA_MAX) {
     lm_error_set(LM_ERR_MPTPBadData);
+    lm_mptp_free(packet);
     return false;
   }
 
   if (packet->header.host_size != 0) {
     lm_error_set(LM_ERR_MPTPBadHost);
+    lm_mptp_free(packet);
     return false;
   }
 
-  char      buffer[sizeof(packet->header) + packet->header.host_size + packet->header.data_size];
+  char      buffer[
+    sizeof(packet->header) + 
+    packet->header.host_size + 
+    packet->header.path_size + 
+    packet->header.data_size
+  ];
   ssize_t   total = sizeof(buffer), used = 0, buflen = total;
-
+  bool ret = false;
-  packet->header.flags = htons(packet->header.flags);
 
   copy_to_buffer(buffer, &packet->header, sizeof(packet->header), &total, &used);
   copy_to_buffer(buffer, packet->host, packet->header.host_size, &total, &used);
+  copy_to_buffer(buffer, packet->path, packet->header.path_size, &total, &used);
   copy_to_buffer(buffer, packet->data, packet->header.data_size, &total, &used);
   
+  packet->header.flags = htons(packet->header.flags);
+  //packet->header.host_size = htons(packet->header.host_size);
+  //packet->header.path_size = htons(packet->header.path_size);
+  packet->header.data_size = htons(packet->header.data_size);
+
   if (send(sock, buffer, buflen, MSG_MORE) < 0) {
     lm_error_set(LM_ERR_MPTPSendFail);
-    return false;
+    goto end;
   }
 
   pdebug(__func__, "printing the packet dump (%lu bytes)", buflen);
   pdebug_binary(buffer, buflen);
+  ret = true;
 
-  return true;
+end:
+  lm_mptp_free(packet);
+  return ret;
 }

src/mptp/util.c

@@ -24,6 +24,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
   struct stat st;
   int size = -1;
   
+  lm_mptp_init(&packet);
+
   if(NULL == file){
     pdebug(__func__, "failed to open file: %s", path);
     lm_error_set(LM_ERR_SendOpenFail);
@@ -38,7 +40,9 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
 
   total = st.st_size;
 
-  lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
+  lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
+  lm_mptp_set_data(&packet, NULL, digits(st.st_size));
+
   if((size = snprintf(packet.data, MPTP_DATA_MAX, "%lu", st.st_size)) <= 0){
     pdebug(__func__, "snprintf for stat size failed: %s", path);
     lm_error_set(LM_ERR_SendSnprintfFail);
@@ -52,7 +56,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
     goto end_1;
 
   // clear the packet
-  lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
+  lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
+  lm_mptp_set_data(&packet, NULL, MPTP_DATA_MAX);
 
   while ((read = fread(packet.data, 1, MPTP_DATA_MAX, file)) > 0) {
     packet.header.data_size = read;
@@ -68,7 +73,8 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
     if(NULL != callback && !callback(path, current, st.st_size, data))
       goto end_1;
 
-    lm_mptp_init(&packet, false, MPTP_S2C_COOL, false);
+    lm_mptp_free(&packet);
+    lm_mptp_new(&packet, false, MPTP_S2C_COOL, false);
   }
 
   if(current != total){
@@ -78,14 +84,16 @@ bool lm_mptp_sendfile(int sock, char *path, lm_mptp_transfer_callback_t callback
   }
 
   pdebug(__func__, "completed sending %s, sending last packet", path);
-  lm_mptp_init(&packet, false, MPTP_S2C_COOL, true);
+  lm_mptp_new(&packet, false, MPTP_S2C_COOL, true);
   lm_mptp_server_send(sock, &packet);
   ret = true;
   goto end_2;
 
 end_1:
-  lm_mptp_init(&packet, false, MPTP_S2C_BRUH, true);
+  lm_mptp_free(&packet);
+  lm_mptp_new(&packet, false, MPTP_S2C_BRUH, true);
   lm_mptp_server_send(sock, &packet);
+  lm_mptp_free(&packet);
 end_2:
   if(NULL != file)
     fclose(file);
@@ -108,6 +116,8 @@ bool lm_mptp_recvfile(int sock, char *path, lm_mptp_transfer_callback_t callback
   bool ret = false;
   lm_mptp_t packet;
 
+  lm_mptp_init(&packet);
+
   if(NULL == file){
     pdebug(__func__, "failed to open file: %s", path);
     lm_error_set(LM_ERR_RecvOpenFail);
@@ -176,6 +186,7 @@ bool lm_mptp_recvfile(int sock, char *path, lm_mptp_transfer_callback_t callback
 
   ret = true;
 end:
+  lm_mptp_free(&packet);
   if(NULL != file)
     fclose(file);
   return ret;

src/pool/info.c

@@ -106,9 +106,9 @@ bool lm_pool_info_download(lm_pool_t *pool, lm_mptp_transfer_callback_t callback
   if((sock = lm_mptp_client_connect(pool->url.host, pool->url.port)) < 0)
     return false;
 
-  lm_mptp_init(&packet, true, MPTP_C2S_INFO, true);
+  lm_mptp_new(&packet, true, MPTP_C2S_INFO, true);
   lm_mptp_set_host(&packet, pool->url.host);
-  lm_mptp_set_data(&packet, pool->url.path, strlen(pool->url.path));
+  lm_mptp_set_path(&packet, pool->url.path);
 
   if(!lm_mptp_client_send(sock, &packet)){
     pdebug(__func__, "info file request failed for %s: %s", pool->name, lm_strerror());
@@ -122,6 +122,7 @@ bool lm_pool_info_download(lm_pool_t *pool, lm_mptp_transfer_callback_t callback
 
   ret = true;
 end:
+  lm_mptp_free(&packet);
   lm_mptp_close(sock);
   if(ret)
     ret = lm_pool_info_load(pool);

src/pool/list.c

@@ -119,9 +119,9 @@ bool lm_pool_list_download(lm_pool_t *pool, char *dir, lm_mptp_transfer_callback
   if((sock = lm_mptp_client_connect(pool->url.host, pool->url.port)) < 0)
     return false;
 
-  lm_mptp_init(&packet, true, MPTP_C2S_LIST, true);
+  lm_mptp_new(&packet, true, MPTP_C2S_LIST, true);
   lm_mptp_set_host(&packet, pool->url.host);
-  lm_mptp_set_data(&packet, pool->url.path, strlen(pool->url.path));
+  lm_mptp_set_path(&packet, pool->url.path);
 
   if(!lm_mptp_client_send(sock, &packet)){
     pdebug(__func__, "list file request failed for %s: %s", pool->name, lm_strerror());
@@ -135,6 +135,7 @@ bool lm_pool_list_download(lm_pool_t *pool, char *dir, lm_mptp_transfer_callback
 
   ret = true;
 end:
+  lm_mptp_free(&packet);
   lm_mptp_close(sock);
   if(ret)
     ret = lm_pool_list_load(pool, dir);

src/pool/pool.c

@@ -30,10 +30,10 @@ lm_pool_t *lm_pool_new(char *name, char *url) {
 
 void lm_pool_test(lm_pool_t *pool) {
   lm_mptp_t packet;
-  lm_mptp_init(&packet, true, MPTP_C2S_PING, true);
+  lm_mptp_new(&packet, true, MPTP_C2S_PING, true);
 
   lm_mptp_set_host(&packet, pool->url.host);
-  lm_mptp_set_data(&packet, pool->url.path, strlen(pool->url.path));
+  lm_mptp_set_path(&packet, pool->url.path);
 
   int sock = lm_mptp_client_connect(pool->url.host, pool->url.port);
   if (sock == -1) {
@@ -60,6 +60,7 @@ void lm_pool_test(lm_pool_t *pool) {
   if(!pool->available)
     lm_error_set(LM_ERR_PoolTestNotPong);
 end:
+  lm_mptp_free(&packet);
   lm_mptp_close(sock);
   return;
 }

src/util.c

@@ -108,7 +108,9 @@ bool copy_to_buffer(void *buffer, void *src, size_t size, ssize_t *total, ssize_
   if (*used == 0)
     bzero(buffer, *total);
 
+  if (NULL != buffer && NULL != src && size > 0)
     memcpy(buffer + *used, src, size);
+
   *used += size;
   return true;
 }
@@ -120,7 +122,9 @@ bool copy_from_buffer(void *dst, void *buffer, size_t size, ssize_t *total, ssiz
   if (*used == 0)
     bzero(dst, size);
 
+  if (NULL != buffer && NULL != dst && size > 0)
     memcpy(dst, buffer + *used, size);
+
   *used += size;
   return true;
 }
@@ -582,3 +586,11 @@ bool is_dir_empty(char *p) {
   closedir(fd);
   return empty;
 }
+
+int digits(int n) {
+  if (n < 0)
+    return digits((n == INT_MIN) ? INT_MAX : -n);
+  if (n < 10)
+    return 1;
+  return 1 + digits(n / 10);
+}