fix: use the signed type for ctx_sync return

.gitignore

@@ -1,4 +1,7 @@
-./config.ini
+config.ini
+!install/config.ini
+docker-compose.yml
+compose.yml
 *.pot
 *.mo
 dist

Makefile

@@ -11,7 +11,7 @@ HDRS    = $(wildcard include/*.h)
 CFLAGS  = -O3 -fstack-protector-strong -fcf-protection=full -fstack-clash-protection
 LIBS    = -linih -lmp
 
-VERSION = 24.00
+VERSION = 24.03
 
 all: dist dist/pooler $(PO_OUTS)
 
@@ -43,8 +43,8 @@ locale/pooler.pot: $(SRCS)
 
 install:
 	install -d -m700 $(DESTDIR)/etc/pooler
-	install -m755 dist/pooler $(DESTDIR)/$(PREFIX)/bin/pooler
+	install -Dm755 dist/pooler $(DESTDIR)/$(PREFIX)/bin/pooler
-	install -m600 install/config.ini $(DESTDIR)/etc/pooler/config.ini
+	install -Dm600 install/config.ini $(DESTDIR)/etc/pooler/config.ini
 	@for po in $(PO_DIRS) ; do \
 		echo "installing locale: $$po/pooler.mo" ; \
 		mkdir -pv $(DESTDIR)/$(PREFIX)/share/$$po ; \

README.md

@@ -34,8 +34,22 @@ You can also build the program using docker:
 docker build --tag pooler .
 ```
 
-And for deployment you can use docker-compose, just make sure you read the compose file
+And for deployment you can use docker-compose, here is an example configuration:
-and place the configuration file and the pools to the right place:
+```yaml
+version: "3"
+
+services:
+  pooler:
+    image: pooler
+    build:
+      context: ./
+    ports:
+      - "5858:5858/tcp"
+    volumes:
+      - "./config.ini:/etc/pooler/config.ini"
+```
+Just make sure you read the compose file and place the configuration file and the pools
+to the right place:
 ```bash
 docker-compose up -d
 ```

docker-compose.yml

@@ -1,10 +0,0 @@
-version: "3"
-
-services:
-  pooler:
-    build:
-      context: ./
-    ports:
-      - "5858:5858/udp"
-    volumes:
-      - "./config.ini:/etc/pooler/config.ini"

install/config.ini

@@ -4,6 +4,7 @@
 addr    = 0.0.0.0:5858
 threads = 10
 
-# [pool-name]
+# [pool-config]
+# name = pool-name
 # host = pool.example.com
 # dir  = /srv/pools/pool-name

locale/tr/LC_MESSAGES/pooler.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-08-07 01:48+0300\n"
+"POT-Creation-Date: 2024-08-25 14:08+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"
@@ -17,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/config.c:125
+#: src/config.c:135
 #, c-format
 msgid "Unknown configuration option: %s"
 msgstr ""
 
-#: src/config.c:127
+#: src/config.c:137
 #, c-format
 msgid "Unknown configuration option: %s/%s"
 msgstr ""
 
-#: src/config.c:135
+#: src/config.c:145
 #, fuzzy, c-format
 msgid "Failed to access the configuration file: %s"
 msgstr "Kayıt dosyasını açmak başarısız oldu: %s"
 
-#: src/config.c:140
+#: src/config.c:150
 #, fuzzy
 msgid "Failed to parse the configuration"
 msgstr "Kayıt dosyasını açmak başarısız oldu: %s"
 
-#: src/config.c:147
+#: src/config.c:160
 #, fuzzy, c-format
 msgid "Hostname not specified for the pool: %s"
 msgstr "Ana makine adı havuz konfigürasyonunda belirtilmedi, geçiliyor: %s"
@@ -82,77 +82,77 @@ msgstr ""
 msgid "Request from %s: PULL (%s)"
 msgstr ""
 
-#: src/main.c:109
+#. disable buffering so docker-compose logs works correctly
+#: src/main.c:110
 #, fuzzy, c-format
 msgid "Starting pooler %s (libmp %s)"
 msgstr "%lu tane havuz %s adresinde sunuluyor"
 
-#: src/main.c:112
+#: src/main.c:113
 msgid "Configuration file not specified"
 msgstr "Konfigürasyon dosyası belirtilmedi"
 
-#: src/main.c:125
+#: src/main.c:126
 msgid "Loaded the configuration"
 msgstr ""
 
-#: src/main.c:128
+#: src/main.c:129
 #, fuzzy
 msgid "Failed to get the temp directory configuration option (tmpdir)"
 msgstr "Kayıt dosyasını açmak başarısız oldu: %s"
 
-#: src/main.c:136
+#: src/main.c:137
 msgid "Please specify a valid thread count (1-1000)"
 msgstr "Lütfen geçerli bir işlem sayısı belirtin (1-1000)"
 
-#: src/main.c:141
+#: src/main.c:142
 msgid "Please specify at least one pool in the configuration"
 msgstr "Lütfen konfigürasyonda en az bir havuz belirtin"
 
-#: src/main.c:146
+#: src/main.c:148
-#, fuzzy, c-format
-msgid "%s: loading the pool"
-msgstr "%s: havuz bilgisi başarıyla yüklendi"
-
-#: src/main.c:149
 #, fuzzy, c-format
 msgid "%s: hostname not specified for pool, skipping"
 msgstr "Ana makine adı havuz konfigürasyonunda belirtilmedi, geçiliyor: %s"
 
-#: src/main.c:157
+#: src/main.c:162
 #, fuzzy, c-format
 msgid "%s: failed access the pool directory (%s)"
 msgstr "Havuz dizinine erişilemiyor: %s"
 
-#: src/main.c:162
+#: src/main.c:167
 #, fuzzy, c-format
 msgid "%s: failed to add pool to the list (%s)"
 msgstr "Havuzu listeye eklemek başarısız oldu: %s"
 
-#: src/main.c:170
+#: src/main.c:175
-#, c-format
+#, fuzzy
-msgid "Failed to sync the pools: %s"
+msgid "Failed to sync the pools, please see the errors above"
 msgstr "Havuzları sekronize etmek başarısız oldu: %s"
 
-#: src/main.c:175
+#: src/main.c:180
 #, fuzzy
 msgid "None of the pools is available for serving"
 msgstr "Havuzların hiçbiri sunmak için müsait değil"
 
-#: src/main.c:179
+#: src/main.c:184
 #, c-format
 msgid "Serving %lu pool on %s"
 msgstr "%lu tane havuz %s adresinde sunuluyor"
 
-#: src/main.c:179
+#: src/main.c:184
 #, c-format
 msgid "Serving %lu pools on %s"
 msgstr "%lu tane havuz %s adresinde sunuluyor"
 
-#: src/main.c:182
+#: src/main.c:187
 #, c-format
 msgid "Failed to start the server: %s"
 msgstr "Sunucuyu başlatmak başarısız oldu: %s"
 
+#, fuzzy, c-format
+#~ msgid "%s: loading the pool"
+#~ msgstr "%s: havuz bilgisi başarıyla yüklendi"
+
 #, fuzzy, c-format
 #~ msgid "%s: loaded the pool"
 #~ msgstr "%s: havuz bilgisi başarıyla yüklendi"

src/config.c

@@ -21,21 +21,21 @@ config_t config = {
     .pools = NULL,
 };
 
-pool_config_t *config_pool_add(char *name) {
+pool_config_t *config_pool_add(char *section) {
   pool_config_t *pool = malloc(sizeof(pool_config_t));
   bzero(pool, sizeof(pool_config_t));
 
-  pool->name   = strdup(name);
+  pool->section = strdup(section);
-  pool->next   = config.pools;
+  pool->next    = config.pools;
-  config.pools = pool;
+  config.pools  = pool;
 
   return pool;
 }
 
-bool config_pool_contains(char *name) {
+bool config_pool_contains(char *section) {
   pool_config_t *cur = config.pools;
   while (NULL != cur) {
-    if (eq(cur->name, name))
+    if (eq(cur->section, section))
       return true;
     cur = cur->next;
   }
@@ -105,11 +105,21 @@ int config_load_handler(void *data, const char *_section, const char *_key, cons
   if (!config_pool_contains(section))
     config_pool_add(section);
 
-  if (eq(key, "host")) {
+  if (eq(key, "name")) {
+    free(config.pools->name);
+    config.pools->name = strdup(value);
+  }
+
+  else if (eq(key, "host")) {
     free(config.pools->host);
     config.pools->host = strdup(value);
   }
 
+  else if (eq(key, "path")) {
+    free(config.pools->path);
+    config.pools->path = strdup(value);
+  }
+
   else if (eq(key, "dir")) {
     free(config.pools->dir);
     config.pools->dir = strdup(value);
@@ -143,10 +153,14 @@ bool config_load(char *file) {
 
   pool_config_t *pool = config.pools;
   while (NULL != pool) {
+    if (NULL == pool->name)
+      pool->name = pool->section;
+
     if (NULL == pool->host) {
       error(_("Hostname not specified for the pool: %s"), pool->name);
       return false;
     }
+
     pool = pool->next;
   }
 
@@ -162,8 +176,12 @@ void config_free() {
     old = cur;
     cur = cur->next;
 
+    free(old->section);
+    if (old->section != old->name)
+      free(old->name);
     free(old->host);
-    free(old->name);
+    free(old->path);
+    free(old->dir);
     free(old);
   }
 }

src/config.h

@@ -21,8 +21,10 @@ typedef struct config_option {
 
 typedef struct pool_config {
   struct pool_config *next;
+  char               *section;
   char               *name;
   char               *host;
+  char               *path;
   char               *dir;
 } pool_config_t;
 

src/main.c

@@ -106,6 +106,7 @@ bool serve_callback(lm_pool_t *pool, lm_mptp_t *packet, struct sockaddr *addr, v
 }
 
 int main(int argc, char *argv[]) {
+  setbuf(stdout, NULL); // disable buffering so docker-compose logs works correctly
   info(_("Starting pooler %s (libmp %s)"), VERSION, LM_VERSION);
 
   if (argc != 2) {
@@ -116,7 +117,7 @@ int main(int argc, char *argv[]) {
   char          *addr = NULL, *logfile = NULL, *tmpdir = NULL;
   int            ret        = EXIT_FAILURE;
   pool_config_t *pool       = NULL;
-  size_t         pool_count = 0;
+  ssize_t        pool_count = 0;
   lm_ctx_t       ctx;
 
   if (!config_load(argv[1]))
@@ -143,15 +144,19 @@ int main(int argc, char *argv[]) {
   }
 
   while (NULL != pool) {
-    info(_("%s: loading the pool"), pool->name);
-
     if (NULL == pool->host) {
       error(_("%s: hostname not specified for pool, skipping"), pool->name);
       goto end_ctx;
     }
 
-    char url[strlen(pool->host) + 20];
+    char url[strlen(pool->host) + 20 + (pool->path == NULL ? 0 : strlen(pool->path))];
-    sprintf(url, "mptp://%s", pool->host);
+
+    if (NULL == pool->path)
+      sprintf(url, "mptp://%s/", pool->host);
+    else if (pool->path[0] == '/')
+      sprintf(url, "mptp://%s%s", pool->host, pool->path);
+    else
+      sprintf(url, "mptp://%s/%s", pool->host, pool->path);
 
     if (!file_canread(pool->dir)) {
       error(_("%s: failed access the pool directory (%s)"), pool->name, pool->dir);
@@ -167,7 +172,7 @@ int main(int argc, char *argv[]) {
   }
 
   if ((pool_count = lm_ctx_sync(&ctx, false, sync_callback, NULL)) < 0) {
-    error(_("Failed to sync the pools: %s"), lm_strerror());
+    error(_("Failed to sync the pools, please see the errors above"));
     goto end_ctx;
   }
 
@@ -178,7 +183,7 @@ int main(int argc, char *argv[]) {
 
   info(pool_count == 1 ? _("Serving %lu pool on %s") : _("Serving %lu pools on %s"), pool_count, addr);
 
-  if (!lm_ctx_serve(&ctx, addr, config_get_integer("threads"), serve_callback, NULL)) {
+  if (!lm_ctx_serve(&ctx, addr, config_get_integer("threads"), NULL, serve_callback, NULL)) {
     error(_("Failed to start the server: %s"), lm_strerror());
     goto end_ctx;
   }