Merge branch 'main' into coverity

baresip · Mar 3, 2024 · 49f7ce6 · 49f7ce6
2 parents e6ea8ab + aefb21e
commit 49f7ce6
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 11 deletions.
diff --git a/include/re_conf.h b/include/re_conf.h
@@ -15,6 +15,7 @@ int conf_get(const struct conf *conf, const char *name, struct pl *pl);
 int conf_get_str(const struct conf *conf, const char *name, char *str,
 		 size_t size);
 int conf_get_u32(const struct conf *conf, const char *name, uint32_t *num);
+int conf_get_i32(const struct conf *conf, const char *name, int32_t *num);
 int conf_get_bool(const struct conf *conf, const char *name, bool *val);
 int conf_apply(const struct conf *conf, const char *name,
 	       conf_h *ch, void *arg);
diff --git a/src/conf/conf.c b/src/conf/conf.c
@@ -225,6 +225,33 @@ int conf_get_u32(const struct conf *conf, const char *name, uint32_t *num)
 }
 
 
+/**
+ * Get the numeric signed value of a configuration item
+ *
+ * @param conf Configuration object
+ * @param name Name of config item key
+ * @param num  Returned numeric value of config item, if present
+ *
+ * @return 0 if success, otherwise errorcode
+ */
+int conf_get_i32(const struct conf *conf, const char *name, int32_t *num)
+{
+	struct pl pl;
+	int err;
+
+	if (!conf || !name || !num)
+		return EINVAL;
+
+	err = conf_get(conf, name, &pl);
+	if (err)
+		return err;
+
+	*num = pl_i32(&pl);
+
+	return 0;
+}
+
+
 /**
  * Get the boolean value of a configuration item
  *

diff --git a/src/fmt/text2pcap.c b/src/fmt/text2pcap.c
@@ -38,7 +38,7 @@ void re_text2pcap_trace(const char *name, const char *id, bool in,
 	if (!pcap_buf)
 		return;
 
-	re_snprintf(pcap_buf, pcap_buf_sz, "%H", re_text2pcap, &pcap);
+	(void)re_snprintf(pcap_buf, pcap_buf_sz, "%H", re_text2pcap, &pcap);
 
 	re_trace_event("pcap", name, 'I', NULL, RE_TRACE_ARG_STRING_COPY,
 		       "pcap", pcap_buf);

diff --git a/src/sipsess/listen.c b/src/sipsess/listen.c
@@ -15,6 +15,7 @@
 #include <re_msg.h>
 #include <re_sip.h>
 #include <re_sipsess.h>
+#include <re_sys.h>
 #include "sipsess.h"
 
 
@@ -250,11 +251,18 @@ static void target_refresh_handler(struct sipsess_sock *sock,
 
 	if ((is_invite && sess->st)
 	    || (sdp && sess->neg_state == SDP_NEG_LOCAL_OFFER)) {
-		(void)sip_treplyf(NULL, NULL, sip, msg, false,
-				  500, "Server Internal Error",
-				  "Retry-After: 5\r\n"
-				  "Content-Length: 0\r\n"
-				  "\r\n");
+		if (!sess->established) {
+			uint32_t wait = rand_u16() % 11;
+			(void)sip_treplyf(NULL, NULL, sip, msg, false,
+					  500, "Server Internal Error",
+					  "Retry-After: %u\r\n"
+					  "Content-Length: 0\r\n"
+					  "\r\n", wait);
+		}
+		else {
+			(void)sip_treply(NULL, sip, msg, 491,
+					 "Request Pending");
+		}
 		return;
 	}
 

diff --git a/test/conf.c b/test/conf.c
@@ -7,31 +7,40 @@
 #include <re.h>
 #include "test.h"
 
+#define DEBUG_MODULE "test_conf"
+#define DEBUG_LEVEL 5
+#include <re_dbg.h>
+
 
 int test_conf(void)
 {
 	static const char *cfg =
 		"string_val\trattarei\n"
-		"u32_val       42\n";
+		"u32_val       42\n"
+		"i32_val       -23\n";
 	char str[256];
 	struct conf *conf;
 	struct pl pl;
 	uint32_t u32;
+	int32_t i32;
 	int err;
 
 	err = conf_alloc_buf(&conf, (uint8_t *)cfg, strlen(cfg));
 	if (err)
 		return err;
 
 	err = conf_get_str(conf, "string_val", str, sizeof(str));
-	if (err)
-		goto out;
+	TEST_ERR(err);
 	if (strcmp(str, "rattarei"))
 		goto badmsg;
 
 	err = conf_get_u32(conf, "u32_val", &u32);
-	if (u32 != 42)
-		goto badmsg;
+	TEST_ERR(err);
+	TEST_EQUALS(42, u32);
+
+	err = conf_get_i32(conf, "i32_val", &i32);
+	TEST_ERR(err);
+	TEST_EQUALS(-23, i32);
 
 	/* Non-existing parameters */
 	if (0 == conf_get(conf, "rattarei", &pl))