Updated license and renamed destructor functions

codepr · codepr · commit 80bd6b050fe5 · 2024-12-16T00:28:07.000Z
diff --git a/COPYING b/COPYING
@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2023, Andrea Giacomo Baldan
+Copyright (c) 2025, Andrea Giacomo Baldan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/bst.c b/src/bst.c
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023 Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025 Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/bst.h b/src/bst.h
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023 Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025 Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -45,6 +45,6 @@ struct bst_node *bst_search(const struct bst_node *, unsigned char);
 
 struct bst_node *bst_delete(struct bst_node *, unsigned char);
 
-void bst_destroy(struct bst_node *, void (*free_fn)(struct bst_node *));
+void bst_free(struct bst_node *, void (*free_fn)(struct bst_node *));
 
 #endif
diff --git a/src/config.c b/src/config.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/config.h b/src/config.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/ev.c b/src/ev.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/ev.h b/src/ev.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/handlers.c b/src/handlers.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -86,8 +86,8 @@ static void session_free(const struct ref *refcount)
 {
     struct client_session *session =
         container_of(refcount, struct client_session, refcount);
-    list_destroy(session->subscriptions, 0);
-    list_destroy(session->outgoing_msgs, 0);
+    list_free(session->subscriptions, 0);
+    list_free(session->outgoing_msgs, 0);
     if (has_inflight(session)) {
         for (int i = 0; i < MAX_INFLIGHT_MSGS; ++i) {
             if (session->i_msgs[i].packet)
diff --git a/src/handlers.h b/src/handlers.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/iterator.c b/src/iterator.c
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -50,7 +50,7 @@ void iter_init(struct iterator *i, void *iterable,
     iter_next(i);
 }
 
-void iter_destroy(struct iterator *i) { free_memory(i); }
+void iter_free(struct iterator *i) { free_memory(i); }
 
 /*
  * Advance the iterator ptr to the next item in the iterable collection
diff --git a/src/iterator.h b/src/iterator.h
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -47,7 +47,7 @@ struct iterator {
 struct iterator *iter_new(void *, void (*next)(struct iterator *));
 void iter_init(struct iterator *, void *, void (*next)(struct iterator *));
 struct iterator *iter_next(struct iterator *);
-void iter_destroy(struct iterator *);
+void iter_free(struct iterator *);
 
 #define FOREACH(it) for (; it && it->ptr; it = iter_next(it))
 
diff --git a/src/list.c b/src/list.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan
+ * Copyright (c) 2025, Andrea Giacomo Baldan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,7 +49,7 @@ List *list_new(int (*destructor)(struct list_node *))
 /*
  * Destroy a list, releasing all allocated memory
  */
-void list_destroy(List *l, int deep)
+void list_free(List *l, int deep)
 {
     if (!l)
         return;
diff --git a/src/list.h b/src/list.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan
+ * Copyright (c) 2025, Andrea Giacomo Baldan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@ List *list_new(int (*destructor)(struct list_node *));
  * Release a list, accept a integer flag to control the depth of the free call
  * (e.g. going to free also data field of every node)
  */
-void list_destroy(List *, int);
+void list_free(List *, int);
 
 /* Return list size */
 unsigned long list_size(const List *);
diff --git a/src/logging.c b/src/logging.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/logging.h b/src/logging.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/memory.c b/src/memory.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/memory.h b/src/memory.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/memorypool.c b/src/memorypool.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan
+ * Copyright (c) 2025, Andrea Giacomo Baldan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/memorypool.h b/src/memorypool.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan
+ * Copyright (c) 2025, Andrea Giacomo Baldan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/src/mqtt.c b/src/mqtt.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/mqtt.h b/src/mqtt.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/network.c b/src/network.c
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/network.h b/src/network.h
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/pack.c b/src/pack.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023 Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025 Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/pack.h b/src/pack.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/ref.h b/src/ref.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/server.c b/src/server.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -581,6 +581,7 @@ static void process_mqtt_message(Connection_Context *c, off_t start,
     case -ERRCLIENTDC:
         // Client disconnected, set resources to be cleaned up
         c->state = CS_CLOSING;
+        shutdown(c->conn.fd, SHUT_RDWR);
         break;
     case -ERRNOMEM:
         log_error(solerr(c->rc));
diff --git a/src/server.h b/src/server.h
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/sol.c b/src/sol.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/src/sol_internal.h b/src/sol_internal.h
@@ -1,7 +1,7 @@
 /*
  * BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -256,7 +256,7 @@ struct topic *topic_new(const char *);
 /*
  * Deallocate the topic name, retained_msg and all its subscribers
  */
-void topic_destroy(struct topic *);
+void topic_free(struct topic *);
 
 /*
  * Allocate a new subscriber struct on the heap referring to the passed in
diff --git a/src/subscriber.c b/src/subscriber.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,7 +29,7 @@
 #include "sol_internal.h"
 #include "util.h"
 
-static void subscriber_destroy(const struct ref *);
+static void subscriber_free(const struct ref *);
 
 /*
  * Allocate memory on the heap to create and return a pointer to a struct
@@ -42,7 +42,7 @@ struct subscriber *subscriber_new(struct client_session *s, unsigned char qos)
     struct subscriber *sub = try_alloc(sizeof(*sub));
     sub->session           = s;
     sub->granted_qos       = qos;
-    sub->refcount = (struct ref){.count = 0, .free = subscriber_destroy};
+    sub->refcount          = (struct ref){.count = 0, .free = subscriber_free};
     memcpy(sub->id, s->session_id, MQTT_CLIENT_ID_LEN);
     return sub;
 }
@@ -59,7 +59,7 @@ struct subscriber *subscriber_clone(const struct subscriber *s)
     struct subscriber *sub = try_alloc(sizeof(*sub));
     sub->session           = s->session;
     sub->granted_qos       = s->granted_qos;
-    sub->refcount = (struct ref){.count = 0, .free = subscriber_destroy};
+    sub->refcount          = (struct ref){.count = 0, .free = subscriber_free};
     memcpy(sub->id, s->id, MQTT_CLIENT_ID_LEN);
     return sub;
 }
@@ -79,7 +79,7 @@ bool is_subscribed(const struct topic *t, const struct client_session *s)
  * Auxiliary function, defines the destructor behavior for subscriber, just
  * decreasing the reference counter till 0, then free the memory.
  */
-static void subscriber_destroy(const struct ref *r)
+static void subscriber_free(const struct ref *r)
 {
     struct subscriber *sub = container_of(r, struct subscriber, refcount);
     free_memory(sub);
diff --git a/src/topic.c b/src/topic.c
@@ -1,6 +1,6 @@
 /* BSD 2-Clause License
  *
- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.
+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -58,7 +58,7 @@ struct topic *topic_new(const char *name)
 /*
  * Deallocate the topic name, retained_msg and all its subscribers
  */
-void topic_destroy(struct topic *t)
+void topic_free(struct topic *t)
 {
     if (!t)
         return;
diff --git a/src/topic_repo.c b/src/topic_repo.c
diff --git a/src/trie.c b/src/trie.c
diff --git a/src/trie.h b/src/trie.h
diff --git a/src/types.h b/src/types.h
diff --git a/src/util.c b/src/util.c
diff --git a/src/util.h b/src/util.h
diff --git a/tests/sol_test.c b/tests/sol_test.c
diff --git a/tests/structures_test.c b/tests/structures_test.c
diff --git a/tests/unit.h b/tests/unit.h

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* BSD 2-Clause License`
`3`	`3`	`*`
`4`		`- * Copyright (c) 2023 Andrea Giacomo Baldan All rights reserved.`
	`4`	`+ * Copyright (c) 2025 Andrea Giacomo Baldan All rights reserved.`
`5`	`5`	`*`
`6`	`6`	`* Redistribution and use in source and binary forms, with or without`
`7`	`7`	`* modification, are permitted provided that the following conditions are met:`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/* BSD 2-Clause License`
`2`	`2`	`*`
`3`		`- * Copyright (c) 2023, Andrea Giacomo Baldan All rights reserved.`
	`3`	`+ * Copyright (c) 2025, Andrea Giacomo Baldan All rights reserved.`
`4`	`4`	`*`
`5`	`5`	`* Redistribution and use in source and binary forms, with or without`
`6`	`6`	`* modification, are permitted provided that the following conditions are met:`