mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-30 15:14:17 +00:00
FS-9952: Fixed some stuff to get the blade service tested upto the point of processing config and listening on the same port across multiple interfaces
This commit is contained in:
1 parent
4ec0fbc581
commit
89940dfc60
9 files changed
+492
-135
No files matched your search
@@ -27,6 +27,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <ks.h>
|
||||
#include <inttypes.h>
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
@@ -209,7 +210,7 @@ extern "C" {
|
||||
* @param l must point to a user-provided memory location
|
||||
* @return 0 for success. -1 for failure
|
||||
*/
|
||||
int list_init(list_t *restrict l);
|
||||
KS_DECLARE(int) list_init(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* completely remove the list from memory.
|
||||
@@ -220,7 +221,7 @@ extern "C" {
|
||||
*
|
||||
* @param l list to destroy
|
||||
*/
|
||||
void list_destroy(list_t *restrict l);
|
||||
KS_DECLARE(void) list_destroy(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* set the comparator function for list elements.
|
||||
@@ -234,7 +235,7 @@ extern "C" {
|
||||
*
|
||||
* @see element_comparator()
|
||||
*/
|
||||
int list_attributes_comparator(list_t *restrict l, element_comparator comparator_fun);
|
||||
KS_DECLARE(int) list_attributes_comparator(list_t *restrict l, element_comparator comparator_fun);
|
||||
|
||||
/**
|
||||
* set a seeker function for list elements.
|
||||
@@ -248,7 +249,7 @@ extern "C" {
|
||||
*
|
||||
* @see element_seeker()
|
||||
*/
|
||||
int list_attributes_seeker(list_t *restrict l, element_seeker seeker_fun);
|
||||
KS_DECLARE(int) list_attributes_seeker(list_t *restrict l, element_seeker seeker_fun);
|
||||
|
||||
/**
|
||||
* require to free element data when list entry is removed (default: don't free).
|
||||
@@ -280,7 +281,7 @@ extern "C" {
|
||||
* @see list_meter_double()
|
||||
* @see list_meter_string()
|
||||
*/
|
||||
int list_attributes_copy(list_t *restrict l, element_meter metric_fun, int copy_data);
|
||||
KS_DECLARE(int) list_attributes_copy(list_t *restrict l, element_meter metric_fun, int copy_data);
|
||||
|
||||
/**
|
||||
* set the element hash computing function for the list elements.
|
||||
@@ -300,7 +301,7 @@ extern "C" {
|
||||
*
|
||||
* @see element_hash_computer()
|
||||
*/
|
||||
int list_attributes_hash_computer(list_t *restrict l, element_hash_computer hash_computer_fun);
|
||||
KS_DECLARE(int) list_attributes_hash_computer(list_t *restrict l, element_hash_computer hash_computer_fun);
|
||||
|
||||
/**
|
||||
* set the element serializer function for the list elements.
|
||||
@@ -321,7 +322,7 @@ extern "C" {
|
||||
* @see list_dump_filedescriptor()
|
||||
* @see list_restore_filedescriptor()
|
||||
*/
|
||||
int list_attributes_serializer(list_t *restrict l, element_serializer serializer_fun);
|
||||
KS_DECLARE(int) list_attributes_serializer(list_t *restrict l, element_serializer serializer_fun);
|
||||
|
||||
/**
|
||||
* set the element unserializer function for the list elements.
|
||||
@@ -343,7 +344,7 @@ extern "C" {
|
||||
* @see list_dump_filedescriptor()
|
||||
* @see list_restore_filedescriptor()
|
||||
*/
|
||||
int list_attributes_unserializer(list_t *restrict l, element_unserializer unserializer_fun);
|
||||
KS_DECLARE(int) list_attributes_unserializer(list_t *restrict l, element_unserializer unserializer_fun);
|
||||
|
||||
/**
|
||||
* append data at the end of the list.
|
||||
@@ -355,7 +356,7 @@ extern "C" {
|
||||
*
|
||||
* @return 1 for success. < 0 for failure
|
||||
*/
|
||||
int list_append(list_t *restrict l, const void *data);
|
||||
KS_DECLARE(int) list_append(list_t *restrict l, const void *data);
|
||||
|
||||
/**
|
||||
* insert data in the head of the list.
|
||||
@@ -367,7 +368,7 @@ extern "C" {
|
||||
*
|
||||
* @return 1 for success. < 0 for failure
|
||||
*/
|
||||
int list_prepend(list_t *restrict l, const void *restrict data);
|
||||
KS_DECLARE(int) list_prepend(list_t *restrict l, const void *restrict data);
|
||||
|
||||
/**
|
||||
* extract the element in the top of the list.
|
||||
@@ -377,7 +378,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return reference to user datum, or NULL on errors
|
||||
*/
|
||||
void *list_fetch(list_t *restrict l);
|
||||
KS_DECLARE(void *) list_fetch(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* retrieve an element at a given position.
|
||||
@@ -386,7 +387,7 @@ extern "C" {
|
||||
* @param pos [0,size-1] position index of the element wanted
|
||||
* @return reference to user datum, or NULL on errors
|
||||
*/
|
||||
void *list_get_at(const list_t *restrict l, unsigned int pos);
|
||||
KS_DECLARE(void *) list_get_at(const list_t *restrict l, unsigned int pos);
|
||||
|
||||
/**
|
||||
* return the maximum element of the list.
|
||||
@@ -400,7 +401,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return the reference to the element, or NULL
|
||||
*/
|
||||
void *list_get_max(const list_t *restrict l);
|
||||
KS_DECLARE(void *) list_get_max(const list_t *restrict l);
|
||||
|
||||
/**
|
||||
* return the minimum element of the list.
|
||||
@@ -414,7 +415,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return the reference to the element, or NULL
|
||||
*/
|
||||
void *list_get_min(const list_t *restrict l);
|
||||
KS_DECLARE(void *) list_get_min(const list_t *restrict l);
|
||||
|
||||
/**
|
||||
* retrieve and remove from list an element at a given position.
|
||||
@@ -423,7 +424,7 @@ extern "C" {
|
||||
* @param pos [0,size-1] position index of the element wanted
|
||||
* @return reference to user datum, or NULL on errors
|
||||
*/
|
||||
void *list_extract_at(list_t *restrict l, unsigned int pos);
|
||||
KS_DECLARE(void *) list_extract_at(list_t *restrict l, unsigned int pos);
|
||||
|
||||
/**
|
||||
* insert an element at a given position.
|
||||
@@ -433,7 +434,7 @@ extern "C" {
|
||||
* @param pos [0,size-1] position index to insert the element at
|
||||
* @return positive value on success. Negative on failure
|
||||
*/
|
||||
int list_insert_at(list_t *restrict l, const void *data, unsigned int pos);
|
||||
KS_DECLARE(int) list_insert_at(list_t *restrict l, const void *data, unsigned int pos);
|
||||
|
||||
/**
|
||||
* expunge the first found given element from the list.
|
||||
@@ -450,7 +451,7 @@ extern "C" {
|
||||
* @see list_attributes_comparator()
|
||||
* @see list_delete_at()
|
||||
*/
|
||||
int list_delete(list_t *restrict l, const void *data);
|
||||
KS_DECLARE(int) list_delete(list_t *restrict l, const void *data);
|
||||
|
||||
/**
|
||||
* expunge an element at a given position from the list.
|
||||
@@ -459,7 +460,7 @@ extern "C" {
|
||||
* @param pos [0,size-1] position index of the element to be deleted
|
||||
* @return 0 on success. Negative value on failure
|
||||
*/
|
||||
int list_delete_at(list_t *restrict l, unsigned int pos);
|
||||
KS_DECLARE(int) list_delete_at(list_t *restrict l, unsigned int pos);
|
||||
|
||||
/**
|
||||
* expunge an array of elements from the list, given their position range.
|
||||
@@ -469,7 +470,7 @@ extern "C" {
|
||||
* @param posend [posstart,size-1] position of the last element to be deleted
|
||||
* @return the number of elements successfully removed on success, <0 on error
|
||||
*/
|
||||
int list_delete_range(list_t *restrict l, unsigned int posstart, unsigned int posend);
|
||||
KS_DECLARE(int) list_delete_range(list_t *restrict l, unsigned int posstart, unsigned int posend);
|
||||
|
||||
/**
|
||||
* clear all the elements off of the list.
|
||||
@@ -482,7 +483,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return the number of elements removed on success, <0 on error
|
||||
*/
|
||||
int list_clear(list_t *restrict l);
|
||||
KS_DECLARE(int) list_clear(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* inspect the number of elements in the list.
|
||||
@@ -490,7 +491,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return number of elements currently held by the list
|
||||
*/
|
||||
unsigned int list_size(const list_t *restrict l);
|
||||
KS_DECLARE(unsigned int) list_size(const list_t *restrict l);
|
||||
|
||||
/**
|
||||
* inspect whether the list is empty.
|
||||
@@ -500,7 +501,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_size()
|
||||
*/
|
||||
int list_empty(const list_t *restrict l);
|
||||
KS_DECLARE(int) list_empty(const list_t *restrict l);
|
||||
|
||||
/**
|
||||
* find the position of an element in a list.
|
||||
@@ -519,7 +520,7 @@ extern "C" {
|
||||
* @see list_attributes_comparator()
|
||||
* @see list_get_at()
|
||||
*/
|
||||
int list_locate(const list_t *restrict l, const void *data);
|
||||
KS_DECLARE(int) list_locate(const list_t *restrict l, const void *data);
|
||||
|
||||
/**
|
||||
* returns an element given an indicator.
|
||||
@@ -534,7 +535,7 @@ extern "C" {
|
||||
* @param indicator indicator data to pass to the seeker along with elements
|
||||
* @return reference to the element accepted by the seeker, or NULL if none found
|
||||
*/
|
||||
void *list_seek(list_t *restrict l, const void *indicator);
|
||||
KS_DECLARE(void *) list_seek(list_t *restrict l, const void *indicator);
|
||||
|
||||
/**
|
||||
* inspect whether some data is member of the list.
|
||||
@@ -555,7 +556,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_contains(const list_t *restrict l, const void *data);
|
||||
KS_DECLARE(int) list_contains(const list_t *restrict l, const void *data);
|
||||
|
||||
/**
|
||||
* concatenate two lists
|
||||
@@ -574,7 +575,7 @@ extern "C" {
|
||||
* @param dest reference to the destination list
|
||||
* @return 0 for success, -1 for errors
|
||||
*/
|
||||
int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest);
|
||||
KS_DECLARE(int) list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest);
|
||||
|
||||
/**
|
||||
* sort list elements.
|
||||
@@ -591,7 +592,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_sort(list_t *restrict l, int versus);
|
||||
KS_DECLARE(int) list_sort(list_t *restrict l, int versus);
|
||||
|
||||
/**
|
||||
* start an iteration session.
|
||||
@@ -603,7 +604,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_iterator_stop()
|
||||
*/
|
||||
int list_iterator_start(list_t *restrict l);
|
||||
KS_DECLARE(int) list_iterator_start(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* return the next element in the iteration session.
|
||||
@@ -611,7 +612,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return element datum, or NULL on errors
|
||||
*/
|
||||
void *list_iterator_next(list_t *restrict l);
|
||||
KS_DECLARE(void *) list_iterator_next(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* inspect whether more elements are available in the iteration session.
|
||||
@@ -619,7 +620,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return 0 iff no more elements are available.
|
||||
*/
|
||||
int list_iterator_hasnext(const list_t *restrict l);
|
||||
KS_DECLARE(int) list_iterator_hasnext(const list_t *restrict l);
|
||||
|
||||
/**
|
||||
* end an iteration session.
|
||||
@@ -627,7 +628,7 @@ extern "C" {
|
||||
* @param l list to operate
|
||||
* @return 0 iff the iteration session cannot be stopped
|
||||
*/
|
||||
int list_iterator_stop(list_t *restrict l);
|
||||
KS_DECLARE(int) list_iterator_stop(list_t *restrict l);
|
||||
|
||||
/**
|
||||
* return the hash of the current status of the list.
|
||||
@@ -637,7 +638,7 @@ extern "C" {
|
||||
*
|
||||
* @return 0 for success; <0 for failure
|
||||
*/
|
||||
int list_hash(const list_t *restrict l, list_hash_t *restrict hash);
|
||||
KS_DECLARE(int) list_hash(const list_t *restrict l, list_hash_t *restrict hash);
|
||||
|
||||
#ifndef SIMCLIST_NO_DUMPRESTORE
|
||||
/**
|
||||
@@ -655,7 +656,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_dump_filedescriptor()
|
||||
*/
|
||||
int list_dump_getinfo_filedescriptor(int fd, list_dump_info_t *restrict info);
|
||||
KS_DECLARE(int) list_dump_getinfo_filedescriptor(int fd, list_dump_info_t *restrict info);
|
||||
|
||||
/**
|
||||
* get meta informations on a list dump on file.
|
||||
@@ -670,7 +671,7 @@ extern "C" {
|
||||
*
|
||||
* @see list_dump_filedescriptor()
|
||||
*/
|
||||
int list_dump_getinfo_file(const char *restrict filename, list_dump_info_t *restrict info);
|
||||
KS_DECLARE(int) list_dump_getinfo_file(const char *restrict filename, list_dump_info_t *restrict info);
|
||||
|
||||
/**
|
||||
* dump the list into an open, writable file descriptor.
|
||||
@@ -706,7 +707,7 @@ extern "C" {
|
||||
* @see list_attributes_copy()
|
||||
* @see list_attributes_serializer()
|
||||
*/
|
||||
int list_dump_filedescriptor(const list_t *restrict l, int fd, size_t *restrict len);
|
||||
KS_DECLARE(int) list_dump_filedescriptor(const list_t *restrict l, int fd, size_t *restrict len);
|
||||
|
||||
/**
|
||||
* dump the list to a file name.
|
||||
@@ -729,7 +730,7 @@ extern "C" {
|
||||
*
|
||||
* This function stores a representation of the list
|
||||
*/
|
||||
int list_dump_file(const list_t *restrict l, const char *restrict filename, size_t *restrict len);
|
||||
KS_DECLARE(int) list_dump_file(const list_t *restrict l, const char *restrict filename, size_t *restrict len);
|
||||
|
||||
/**
|
||||
* restore the list from an open, readable file descriptor to memory.
|
||||
@@ -749,7 +750,7 @@ extern "C" {
|
||||
* @param len location to store the length of the dump read (bytes), or NULL
|
||||
* @return 0 if successful; -1 otherwise
|
||||
*/
|
||||
int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len);
|
||||
KS_DECLARE(int) list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len);
|
||||
|
||||
/**
|
||||
* restore the list from a file name.
|
||||
@@ -767,7 +768,7 @@ extern "C" {
|
||||
* @param len location to store the length of the dump read (bytes), or NULL
|
||||
* @return 0 if successful; -1 otherwise
|
||||
*/
|
||||
int list_restore_file(list_t *restrict l, const char *restrict filename, size_t *len);
|
||||
KS_DECLARE(int) list_restore_file(list_t *restrict l, const char *restrict filename, size_t *len);
|
||||
#endif
|
||||
|
||||
/* ready-made comparators, meters and hash computers */
|
||||
@@ -776,201 +777,201 @@ extern "C" {
|
||||
* ready-made comparator for int8_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_int8_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_int8_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for int16_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_int16_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_int16_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for int32_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_int32_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_int32_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for int64_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_int64_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_int64_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for uint8_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_uint8_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_uint8_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for uint16_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_uint16_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_uint16_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for uint32_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_uint32_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_uint32_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for uint64_t elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_uint64_t (const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_uint64_t (const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for float elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_float(const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_float(const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for double elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_double(const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_double(const void *a, const void *b);
|
||||
|
||||
/**
|
||||
* ready-made comparator for string elements.
|
||||
* @see list_attributes_comparator()
|
||||
*/
|
||||
int list_comparator_string(const void *a, const void *b);
|
||||
KS_DECLARE(int) list_comparator_string(const void *a, const void *b);
|
||||
|
||||
/* metric functions */
|
||||
/**
|
||||
* ready-made metric function for int8_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_int8_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_int8_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for int16_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_int16_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_int16_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for int32_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_int32_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_int32_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for int64_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_int64_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_int64_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for uint8_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_uint8_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_uint8_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for uint16_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_uint16_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_uint16_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for uint32_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_uint32_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_uint32_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for uint64_t elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_uint64_t (const void *el);
|
||||
KS_DECLARE(size_t) list_meter_uint64_t (const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for float elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_float(const void *el);
|
||||
KS_DECLARE(size_t) list_meter_float(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for double elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_double(const void *el);
|
||||
KS_DECLARE(size_t) list_meter_double(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made metric function for string elements.
|
||||
* @see list_attributes_copy()
|
||||
*/
|
||||
size_t list_meter_string(const void *el);
|
||||
KS_DECLARE(size_t) list_meter_string(const void *el);
|
||||
|
||||
/* hash functions */
|
||||
/**
|
||||
* ready-made hash function for int8_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_int8_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_int8_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for int16_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_int16_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_int16_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for int32_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_int32_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_int32_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for int64_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_int64_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_int64_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for uint8_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_uint8_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_uint8_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for uint16_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_uint16_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_uint16_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for uint32_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_uint32_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_uint32_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for uint64_t elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_uint64_t(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_uint64_t(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for float elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_float(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_float(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for double elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_double(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_double(const void *el);
|
||||
|
||||
/**
|
||||
* ready-made hash function for string elements.
|
||||
* @see list_attributes_hash_computer()
|
||||
*/
|
||||
list_hash_t list_hashcomputer_string(const void *el);
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_string(const void *el);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@@ -121,6 +121,15 @@ KS_DECLARE(ks_status_t) ks_socket_option(ks_socket_t socket, int option_name, ks
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
case IPV6_V6ONLY:
|
||||
#ifdef WIN32
|
||||
#warning make sure windows works like linux for IPV6 to IPV4 automapping stuff
|
||||
result = setsockopt(socket, SOL_IPV6, IPV6_V6ONLY, (char *)&opt, sizeof(opt));
|
||||
#else
|
||||
result = setsockopt(socket, SOL_IPV6, IPV6_V6ONLY, &opt, sizeof(opt));
|
||||
#endif
|
||||
if (!result) status = KS_STATUS_SUCCESS;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
+44
-44
@@ -268,7 +268,7 @@ static inline long get_random(void)
|
||||
|
||||
|
||||
/* list initialization */
|
||||
int list_init(list_t *restrict l)
|
||||
KS_DECLARE(int) list_init(list_t *restrict l)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -306,7 +306,7 @@ int list_init(list_t *restrict l)
|
||||
return 0;
|
||||
}
|
||||
|
||||
void list_destroy(list_t *restrict l)
|
||||
KS_DECLARE(void) list_destroy(list_t *restrict l)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
@@ -340,7 +340,7 @@ int list_attributes_setdefaults(list_t *restrict l)
|
||||
}
|
||||
|
||||
/* setting list properties */
|
||||
int list_attributes_comparator(list_t *restrict l, element_comparator comparator_fun)
|
||||
KS_DECLARE(int) list_attributes_comparator(list_t *restrict l, element_comparator comparator_fun)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -352,7 +352,7 @@ int list_attributes_comparator(list_t *restrict l, element_comparator comparator
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_attributes_seeker(list_t *restrict l, element_seeker seeker_fun)
|
||||
KS_DECLARE(int) list_attributes_seeker(list_t *restrict l, element_seeker seeker_fun)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -363,7 +363,7 @@ int list_attributes_seeker(list_t *restrict l, element_seeker seeker_fun)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_attributes_copy(list_t *restrict l, element_meter metric_fun, int copy_data)
|
||||
KS_DECLARE(int) list_attributes_copy(list_t *restrict l, element_meter metric_fun, int copy_data)
|
||||
{
|
||||
if (l == NULL || (metric_fun == NULL && copy_data != 0))
|
||||
return -1;
|
||||
@@ -376,7 +376,7 @@ int list_attributes_copy(list_t *restrict l, element_meter metric_fun, int copy_
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_attributes_hash_computer(list_t *restrict l, element_hash_computer hash_computer_fun)
|
||||
KS_DECLARE(int) list_attributes_hash_computer(list_t *restrict l, element_hash_computer hash_computer_fun)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -386,7 +386,7 @@ int list_attributes_hash_computer(list_t *restrict l, element_hash_computer hash
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_attributes_serializer(list_t *restrict l, element_serializer serializer_fun)
|
||||
KS_DECLARE(int) list_attributes_serializer(list_t *restrict l, element_serializer serializer_fun)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -396,7 +396,7 @@ int list_attributes_serializer(list_t *restrict l, element_serializer serializer
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_attributes_unserializer(list_t *restrict l, element_unserializer unserializer_fun)
|
||||
KS_DECLARE(int) list_attributes_unserializer(list_t *restrict l, element_unserializer unserializer_fun)
|
||||
{
|
||||
if (l == NULL)
|
||||
return -1;
|
||||
@@ -406,22 +406,22 @@ int list_attributes_unserializer(list_t *restrict l, element_unserializer unseri
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_append(list_t *restrict l, const void *data)
|
||||
KS_DECLARE(int) list_append(list_t *restrict l, const void *data)
|
||||
{
|
||||
return list_insert_at(l, data, l->numels);
|
||||
}
|
||||
|
||||
int list_prepend(list_t *restrict l, const void *data)
|
||||
KS_DECLARE(int) list_prepend(list_t *restrict l, const void *data)
|
||||
{
|
||||
return list_insert_at(l, data, 0);
|
||||
}
|
||||
|
||||
void *list_fetch(list_t *restrict l)
|
||||
KS_DECLARE(void *) list_fetch(list_t *restrict l)
|
||||
{
|
||||
return list_extract_at(l, 0);
|
||||
}
|
||||
|
||||
void *list_get_at(const list_t *restrict l, unsigned int pos)
|
||||
KS_DECLARE(void *) list_get_at(const list_t *restrict l, unsigned int pos)
|
||||
{
|
||||
struct list_entry_s *tmp;
|
||||
|
||||
@@ -430,12 +430,12 @@ void *list_get_at(const list_t *restrict l, unsigned int pos)
|
||||
return (tmp != NULL ? tmp->data : NULL);
|
||||
}
|
||||
|
||||
void *list_get_max(const list_t *restrict l)
|
||||
KS_DECLARE(void *) list_get_max(const list_t *restrict l)
|
||||
{
|
||||
return list_get_minmax(l, +1);
|
||||
}
|
||||
|
||||
void *list_get_min(const list_t *restrict l)
|
||||
KS_DECLARE(void *) list_get_min(const list_t *restrict l)
|
||||
{
|
||||
return list_get_minmax(l, -1);
|
||||
}
|
||||
@@ -488,7 +488,7 @@ static inline struct list_entry_s *list_findpos(const list_t *restrict l, int po
|
||||
return ptr;
|
||||
}
|
||||
|
||||
void *list_extract_at(list_t *restrict l, unsigned int pos)
|
||||
KS_DECLARE(void *) list_extract_at(list_t *restrict l, unsigned int pos)
|
||||
{
|
||||
struct list_entry_s *tmp;
|
||||
void *data;
|
||||
@@ -508,7 +508,7 @@ void *list_extract_at(list_t *restrict l, unsigned int pos)
|
||||
return data;
|
||||
}
|
||||
|
||||
int list_insert_at(list_t *restrict l, const void *data, unsigned int pos)
|
||||
KS_DECLARE(int) list_insert_at(list_t *restrict l, const void *data, unsigned int pos)
|
||||
{
|
||||
struct list_entry_s *lent, *succ, *prec;
|
||||
|
||||
@@ -561,7 +561,7 @@ int list_insert_at(list_t *restrict l, const void *data, unsigned int pos)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int list_delete(list_t *restrict l, const void *data)
|
||||
KS_DECLARE(int) list_delete(list_t *restrict l, const void *data)
|
||||
{
|
||||
int pos, r;
|
||||
|
||||
@@ -578,7 +578,7 @@ int list_delete(list_t *restrict l, const void *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_delete_at(list_t *restrict l, unsigned int pos)
|
||||
KS_DECLARE(int) list_delete_at(list_t *restrict l, unsigned int pos)
|
||||
{
|
||||
struct list_entry_s *delendo;
|
||||
|
||||
@@ -598,7 +598,7 @@ int list_delete_at(list_t *restrict l, unsigned int pos)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_delete_range(list_t *restrict l, unsigned int posstart, unsigned int posend)
|
||||
KS_DECLARE(int) list_delete_range(list_t *restrict l, unsigned int posstart, unsigned int posend)
|
||||
{
|
||||
struct list_entry_s *lastvalid, *tmp, *tmp2;
|
||||
unsigned int numdel, midposafter, i;
|
||||
@@ -665,7 +665,7 @@ int list_delete_range(list_t *restrict l, unsigned int posstart, unsigned int po
|
||||
return numdel;
|
||||
}
|
||||
|
||||
int list_clear(list_t *restrict l)
|
||||
KS_DECLARE(int) list_clear(list_t *restrict l)
|
||||
{
|
||||
struct list_entry_s *s;
|
||||
unsigned int numels;
|
||||
@@ -715,17 +715,17 @@ int list_clear(list_t *restrict l)
|
||||
return numels;
|
||||
}
|
||||
|
||||
unsigned int list_size(const list_t *restrict l)
|
||||
KS_DECLARE(unsigned int) list_size(const list_t *restrict l)
|
||||
{
|
||||
return l->numels;
|
||||
}
|
||||
|
||||
int list_empty(const list_t *restrict l)
|
||||
KS_DECLARE(int) list_empty(const list_t *restrict l)
|
||||
{
|
||||
return (l->numels == 0);
|
||||
}
|
||||
|
||||
int list_locate(const list_t *restrict l, const void *data)
|
||||
KS_DECLARE(int) list_locate(const list_t *restrict l, const void *data)
|
||||
{
|
||||
struct list_entry_s *el;
|
||||
int pos = 0;
|
||||
@@ -749,7 +749,7 @@ int list_locate(const list_t *restrict l, const void *data)
|
||||
return pos;
|
||||
}
|
||||
|
||||
void *list_seek(list_t *restrict l, const void *indicator)
|
||||
KS_DECLARE(void *) list_seek(list_t *restrict l, const void *indicator)
|
||||
{
|
||||
const struct list_entry_s *iter;
|
||||
|
||||
@@ -764,12 +764,12 @@ void *list_seek(list_t *restrict l, const void *indicator)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int list_contains(const list_t *restrict l, const void *data)
|
||||
KS_DECLARE(int) list_contains(const list_t *restrict l, const void *data)
|
||||
{
|
||||
return (list_locate(l, data) >= 0);
|
||||
}
|
||||
|
||||
int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest)
|
||||
KS_DECLARE(int) list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest)
|
||||
{
|
||||
struct list_entry_s *el, *srcel;
|
||||
unsigned int cnt;
|
||||
@@ -825,7 +825,7 @@ int list_concat(const list_t *l1, const list_t *l2, list_t *restrict dest)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_sort(list_t *restrict l, int versus)
|
||||
KS_DECLARE(int) list_sort(list_t *restrict l, int versus)
|
||||
{
|
||||
if (l->iter_active || l->attrs.comparator == NULL) /* cannot modify list in the middle of an iteration */
|
||||
return -1;
|
||||
@@ -1005,7 +1005,7 @@ static void list_sort_quicksort(list_t *restrict l, int versus, unsigned int fir
|
||||
#endif
|
||||
}
|
||||
|
||||
int list_iterator_start(list_t *restrict l)
|
||||
KS_DECLARE(int) list_iterator_start(list_t *restrict l)
|
||||
{
|
||||
if (l->iter_active)
|
||||
return 0;
|
||||
@@ -1015,7 +1015,7 @@ int list_iterator_start(list_t *restrict l)
|
||||
return 1;
|
||||
}
|
||||
|
||||
void *list_iterator_next(list_t *restrict l)
|
||||
KS_DECLARE(void *) list_iterator_next(list_t *restrict l)
|
||||
{
|
||||
void *toret;
|
||||
|
||||
@@ -1029,14 +1029,14 @@ void *list_iterator_next(list_t *restrict l)
|
||||
return toret;
|
||||
}
|
||||
|
||||
int list_iterator_hasnext(const list_t *restrict l)
|
||||
KS_DECLARE(int) list_iterator_hasnext(const list_t *restrict l)
|
||||
{
|
||||
if (!l->iter_active)
|
||||
return 0;
|
||||
return (l->iter_pos < l->numels);
|
||||
}
|
||||
|
||||
int list_iterator_stop(list_t *restrict l)
|
||||
KS_DECLARE(int) list_iterator_stop(list_t *restrict l)
|
||||
{
|
||||
if (!l->iter_active)
|
||||
return 0;
|
||||
@@ -1045,7 +1045,7 @@ int list_iterator_stop(list_t *restrict l)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int list_hash(const list_t *restrict l, list_hash_t *restrict hash)
|
||||
KS_DECLARE(int) list_hash(const list_t *restrict l, list_hash_t *restrict hash)
|
||||
{
|
||||
struct list_entry_s *x;
|
||||
list_hash_t tmphash;
|
||||
@@ -1083,7 +1083,7 @@ int list_hash(const list_t *restrict l, list_hash_t *restrict hash)
|
||||
}
|
||||
|
||||
#ifndef SIMCLIST_NO_DUMPRESTORE
|
||||
int list_dump_getinfo_filedescriptor(int fd, list_dump_info_t *restrict info)
|
||||
KS_DECLARE(int) list_dump_getinfo_filedescriptor(int fd, list_dump_info_t *restrict info)
|
||||
{
|
||||
int32_t terminator_head, terminator_tail;
|
||||
uint32_t elemlen;
|
||||
@@ -1148,7 +1148,7 @@ int list_dump_getinfo_filedescriptor(int fd, list_dump_info_t *restrict info)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_dump_getinfo_file(const char *restrict filename, list_dump_info_t *restrict info)
|
||||
KS_DECLARE(int) list_dump_getinfo_file(const char *restrict filename, list_dump_info_t *restrict info)
|
||||
{
|
||||
int fd, ret;
|
||||
|
||||
@@ -1162,7 +1162,7 @@ int list_dump_getinfo_file(const char *restrict filename, list_dump_info_t *rest
|
||||
return ret;
|
||||
}
|
||||
|
||||
int list_dump_filedescriptor(const list_t *restrict l, int fd, size_t *restrict len)
|
||||
KS_DECLARE(int) list_dump_filedescriptor(const list_t *restrict l, int fd, size_t *restrict len)
|
||||
{
|
||||
struct list_entry_s *x;
|
||||
void *ser_buf;
|
||||
@@ -1311,7 +1311,7 @@ int list_dump_filedescriptor(const list_t *restrict l, int fd, size_t *restrict
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len)
|
||||
KS_DECLARE(int) list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len)
|
||||
{
|
||||
struct list_dump_header_s header;
|
||||
unsigned long cnt;
|
||||
@@ -1436,7 +1436,7 @@ int list_restore_filedescriptor(list_t *restrict l, int fd, size_t *restrict len
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_dump_file(const list_t *restrict l, const char *restrict filename, size_t *restrict len)
|
||||
KS_DECLARE(int) list_dump_file(const list_t *restrict l, const char *restrict filename, size_t *restrict len)
|
||||
{
|
||||
int fd, oflag, mode;
|
||||
|
||||
@@ -1457,7 +1457,7 @@ int list_dump_file(const list_t *restrict l, const char *restrict filename, size
|
||||
return 0;
|
||||
}
|
||||
|
||||
int list_restore_file(list_t *restrict l, const char *restrict filename, size_t *restrict len)
|
||||
KS_DECLARE(int) list_restore_file(list_t *restrict l, const char *restrict filename, size_t *restrict len)
|
||||
{
|
||||
int fd;
|
||||
|
||||
@@ -1507,38 +1507,38 @@ static int list_drop_elem(list_t *restrict l, struct list_entry_s *tmp, unsigned
|
||||
}
|
||||
|
||||
/* ready-made comparators and meters */
|
||||
#define SIMCLIST_NUMBER_COMPARATOR(type) int list_comparator_##type(const void *a, const void *b) { return( *(type *)a < *(type *)b) - (*(type *)a > *(type *)b); }
|
||||
#define SIMCLIST_NUMBER_COMPARATOR(type) KS_DECLARE(int) list_comparator_##type(const void *a, const void *b) { return( *(type *)a < *(type *)b) - (*(type *)a > *(type *)b); }
|
||||
|
||||
SIMCLIST_NUMBER_COMPARATOR(int8_t)
|
||||
SIMCLIST_NUMBER_COMPARATOR(int16_t) SIMCLIST_NUMBER_COMPARATOR(int32_t) SIMCLIST_NUMBER_COMPARATOR(int64_t)
|
||||
SIMCLIST_NUMBER_COMPARATOR(uint8_t) SIMCLIST_NUMBER_COMPARATOR(uint16_t) SIMCLIST_NUMBER_COMPARATOR(uint32_t) SIMCLIST_NUMBER_COMPARATOR(uint64_t)
|
||||
SIMCLIST_NUMBER_COMPARATOR(float) SIMCLIST_NUMBER_COMPARATOR(double)
|
||||
|
||||
int list_comparator_string(const void *a, const void *b)
|
||||
KS_DECLARE(int) list_comparator_string(const void *a, const void *b)
|
||||
{
|
||||
return strcmp((const char *) b, (const char *) a);
|
||||
}
|
||||
|
||||
/* ready-made metric functions */
|
||||
#define SIMCLIST_METER(type) size_t list_meter_##type(const void *el) { if (el) { /* kill compiler whinge */ } return sizeof(type); }
|
||||
#define SIMCLIST_METER(type) KS_DECLARE(size_t) list_meter_##type(const void *el) { if (el) { /* kill compiler whinge */ } return sizeof(type); }
|
||||
|
||||
SIMCLIST_METER(int8_t) SIMCLIST_METER(int16_t) SIMCLIST_METER(int32_t) SIMCLIST_METER(int64_t)
|
||||
SIMCLIST_METER(uint8_t) SIMCLIST_METER(uint16_t) SIMCLIST_METER(uint32_t) SIMCLIST_METER(uint64_t)
|
||||
SIMCLIST_METER(float) SIMCLIST_METER(double)
|
||||
|
||||
size_t list_meter_string(const void *el)
|
||||
KS_DECLARE(size_t) list_meter_string(const void *el)
|
||||
{
|
||||
return strlen((const char *) el) + 1;
|
||||
}
|
||||
|
||||
/* ready-made hashing functions */
|
||||
#define SIMCLIST_HASHCOMPUTER(type) list_hash_t list_hashcomputer_##type(const void *el) { return (list_hash_t)(*(type *)el); }
|
||||
#define SIMCLIST_HASHCOMPUTER(type) KS_DECLARE(list_hash_t) list_hashcomputer_##type(const void *el) { return (list_hash_t)(*(type *)el); }
|
||||
|
||||
SIMCLIST_HASHCOMPUTER(int8_t) SIMCLIST_HASHCOMPUTER(int16_t) SIMCLIST_HASHCOMPUTER(int32_t) SIMCLIST_HASHCOMPUTER(int64_t)
|
||||
SIMCLIST_HASHCOMPUTER(uint8_t) SIMCLIST_HASHCOMPUTER(uint16_t) SIMCLIST_HASHCOMPUTER(uint32_t) SIMCLIST_HASHCOMPUTER(uint64_t)
|
||||
SIMCLIST_HASHCOMPUTER(float) SIMCLIST_HASHCOMPUTER(double)
|
||||
|
||||
list_hash_t list_hashcomputer_string(const void *el)
|
||||
KS_DECLARE(list_hash_t) list_hashcomputer_string(const void *el)
|
||||
{
|
||||
size_t l;
|
||||
list_hash_t hash = 123;
|
||||
|
||||
Reference in new issue
Block a user