Getting rid of overcautious asserts on empty RTSP requests, cleaning

wberube · wberube · commit 846827f0a14f · 2026-03-25T01:07:59.000Z
macros, tweaking compat quirks (for upcoming V4L2 support on non-ARM or
-MIPS platforms)
diff --git a/src/compat.c b/src/compat.c
@@ -55,7 +55,7 @@ float __expf_finite(float x) { return expf(x); }
 int __fgetc_unlocked(FILE *stream) { return fgetc(stream); }
 double __log_finite(double x) { return log(x); }
 
-#if !defined(__riscv) && !defined(__riscv__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__mips__)
 void *mmap(void *start, size_t len, int prot, int flags, int fd, uint32_t off) {
     return (void*)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12);
 }
diff --git a/src/hal/macros.h b/src/hal/macros.h
@@ -53,6 +53,9 @@
         fprintf(stderr, "\033[0m"); \
     } while (0)
 
+#ifndef ABS
+#define ABS(x) ((x) < 0 ? -(x) : (x))
+#endif
 #ifndef ALIGN_BACK
 #define ALIGN_BACK(x, a) (((x) / (a)) * (a))
 #endif
@@ -74,6 +77,7 @@
 #define MAX(a, b) (((a) > (b)) ? (a) : (b))
 #endif
 
+#define CLEAR(x) memset(&(x), 0, sizeof(x))
 #define CONTAINS(a, b) strstr(a, b)
 #define EMPTY(x) (x[0] == '\0')
 #define ENDS_WITH(a, b) \
diff --git a/src/rtsp/rtsp.c b/src/rtsp/rtsp.c
@@ -168,15 +168,15 @@ static void __method_describe(struct connection_item_t *p, rtsp_handle h)
             case 96: strncpy(audioRtpfmt, "MPEG4-GENERIC", 16 - 1); break;
             default: strncpy(audioRtpfmt, "UNKNOWN", 16 - 1); break;
         }
-        sprintf(audioRtp, 
+        sprintf(audioRtp,
             "\r\n"
             "m=audio 0 RTP/AVP %d\r\n"
             "a=control:track=1\r\n"
             "a=rtpmap:%d %s/90000\r\n",
             h->audioPt, h->audioPt, audioRtpfmt, h->audioPt);
     }
 
-    if (h->isH265 && 
+    if (h->isH265 &&
         h->sprop_vps_b64 && h->sprop_sps_b64 && h->sprop_sps_b16 && h->sprop_pps_b64) {
         DASSERT(h->sprop_vps_b64->result, return);
         DASSERT(h->sprop_sps_b64->result, return);
@@ -201,7 +201,7 @@ static void __method_describe(struct connection_item_t *p, rtsp_handle h)
                 h->sprop_sps_b64->result,
                 h->sprop_pps_b64->result,
                 audioRtp);
-    } else if (!h->isH265 && 
+    } else if (!h->isH265 &&
         h->sprop_sps_b64 && h->sprop_sps_b16 && h->sprop_pps_b64) {
         DASSERT(h->sprop_sps_b64->result, return);
         DASSERT(h->sprop_sps_b16->result, return);
@@ -270,7 +270,7 @@ static void __method_setup(struct connection_item_t *p, rtsp_handle h)
 
 static void __method_pause(struct connection_item_t *p, rtsp_handle h)
 {
-    fprintf(p->fp_tcp_write, 
+    fprintf(p->fp_tcp_write,
         "RTSP/1.0 "__RESPONCE_STR_METHODNOTALLOWED "\r\n");
 }
 
@@ -302,8 +302,8 @@ static void __method_play(struct connection_item_t *p, rtsp_handle h)
         ASSERT(__bind_rtp(p) == SUCCESS, return);
         p->trans[p->track_id].rtp_timestamp = (millis() * 90) & UINT32_MAX;
         p->trans[p->track_id].rtp_seq = rand_r(&h->ctx);
-        p->trans[p->track_id].rtcp_octet = 0; 
-        p->trans[p->track_id].rtcp_packet_cnt = 0; 
+        p->trans[p->track_id].rtcp_octet = 0;
+        p->trans[p->track_id].rtcp_packet_cnt = 0;
         p->trans[p->track_id].rtcp_tick_org = 150; // TODO: must be variant
         p->trans[p->track_id].rtcp_tick = p->trans[p->track_id].rtcp_tick_org;
 
@@ -377,7 +377,7 @@ static int __message_proc_sock(struct list_t *e, void *p)
                     base64_encode(valid + 6, cred, strlen(cred));
                     isAuthValid = !strncmp(buf + strlen(__STR_AUTH) + 2, valid, strlen(valid));
              } else if (SCMP(__STR_CSEQ, buf)) {
-                ASSERT(tok = strtok_r(buf, ": ", &last), goto error); 
+                ASSERT(tok = strtok_r(buf, ": ", &last), goto error);
                 ASSERT(tok = strtok_r(NULL, ": ", &last), goto error);
                 ASSERT((con->cseq = atoi(tok)) > 0, goto error);
                 con->parser_state = __PARSER_S_CSEQ;
@@ -392,7 +392,7 @@ static int __message_proc_sock(struct list_t *e, void *p)
             } else if (SCMP(__STR_TRANSPORT, buf)) {
                 for (tok = strtok_r(buf, "; ", &last); tok != NULL; tok = strtok_r(NULL, "; ", &last)) {
                     if (SCMP(__STR_CLIENTPORT, tok)) {
-                        ASSERT(sscanf(tok, __STR_CLIENTPORT "=%u-%u", 
+                        ASSERT(sscanf(tok, __STR_CLIENTPORT "=%u-%u",
                             &con->trans[con->track_id].client_port_rtp,
                             &con->trans[con->track_id].client_port_rtcp) > 0,
                                 goto error);
@@ -421,18 +421,21 @@ static int __message_proc_sock(struct list_t *e, void *p)
                 case __METHOD_PAUSE: __method_pause(con, h); break;
                 case __METHOD_RECORDING: __method_record(con, h); break;
                 case __METHOD_TEARDOWN: __method_teardown(con, h); break;
-                case __METHOD_NONE: 
+                case __METHOD_NONE:
                     /* state DISCONNECTED connections should be garbage collected immediately.
                        but sending thread might watches the connection right now.
                        so the connection might live at here */
-                    ASSERT(con->con_state == __CON_S_DISCONNECTED, return FAILURE); 
+                    if (con->con_state != __CON_S_DISCONNECTED) {
+                        ERR("unexpected empty request, forcing disconnect\n");
+                        con->con_state = __CON_S_DISCONNECTED;
+                    }
                     break;
                 default: ERR("unexpected method state\n"); return FAILURE;
             }
         }
 
         fflush(con->fp_tcp_write);
-    } 
+    }
     return SUCCESS;
 }
 
@@ -589,7 +592,7 @@ static inline int __bind_rtp(struct connection_item_t *con )
     addr.sin_port = htons(con->trans[con->track_id].server_port_rtp);
     addr.sin_addr.s_addr = htonl(INADDR_ANY);
     addr.sin_family = AF_INET;
-    
+
     tmp = 1;
     setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &tmp, sizeof(tmp));
 
@@ -741,19 +744,19 @@ static void *rtspThrFxn(void *v)
             /* lock while tcp layer is done */
             rtsp_lock(rh);
 
-            ASSERT(__accept_proc_sock(rh, server_fd, &socks) == SUCCESS, 
+            ASSERT(__accept_proc_sock(rh, server_fd, &socks) == SUCCESS,
                     ({ rtsp_unlock(rh); goto error;}));
 
-            ASSERT(list_map_inline(&rh->con_list, __message_proc_sock, &socks) == SUCCESS, 
+            ASSERT(list_map_inline(&rh->con_list, __message_proc_sock, &socks) == SUCCESS,
                     ({ rtsp_unlock(rh); goto error;}));
 
-            MUST(list_sweep(&rh->con_list, __connection_is_dead) == SUCCESS, 
+            MUST(list_sweep(&rh->con_list, __connection_is_dead) == SUCCESS,
                     ({ rtsp_unlock(rh); goto error;}));
 
             socks.nfds = max(server_fd, __find_fd_max(&rh->con_list)) + 1;
 
             rtsp_unlock(rh);
-        } 
+        }
         //bufpool_statistics(rh->con_pool);
     }
 
@@ -833,7 +836,7 @@ rtsp_handle rtsp_create(unsigned char max_con, unsigned int port, int priority)
 
     return nh;
 
-error: 
+error:
     rtsp_finish(nh);
     return NULL;
 }
@@ -859,4 +862,4 @@ int rtsp_tick(rtsp_handle h)
         return FAILURE;}));
 
     return __get_timestamp_offset(&h->stat, &tv);
-}
+}
diff --git a/src/server.c b/src/server.c
@@ -56,17 +56,17 @@ pthread_mutex_t client_fds_mutex;
 
 static bool is_local_address(const char *client_ip) {
     if (!client_ip) return false;
-    
+
     if (!strcmp(client_ip, "127.0.0.1") ||
         !strncmp(client_ip, "127.", 4))
         return true;
-    
+
     if (!strcmp(client_ip, "::1"))
         return true;
-    
+
     if (!strncmp(client_ip, "::ffff:127.", 11))
         return true;
-    
+
     return false;
 }
 
@@ -108,7 +108,7 @@ int send_to_client(int i, char *buf, ssize_t size) {
         free_client(i);
         return EXIT_FAILURE;
     }
-    
+
     return EXIT_SUCCESS;
 }
 
@@ -121,22 +121,22 @@ void send_http_error(int fd, int code) {
     const char *desc = "\0", *msg = "Unspecified";
     char buffer[256];
     int len;
-    
+
     for (int i = 0; i < sizeof(http_errors) / sizeof(*http_errors); i++) {
         if (http_errors[i].code == code) {
             desc = http_errors[i].desc;
             msg = http_errors[i].msg;
             break;
         }
     }
-    
+
     len = snprintf(buffer, sizeof(buffer),
         "HTTP/1.1 %d %s\r\n"
         "Content-Type: text/plain\r\n"
         "Connection: close\r\n"
         "\r\n%s\r\n",
         code, msg, desc);
-    
+
     send_and_close(fd, buffer, len);
 }
 
@@ -195,7 +195,7 @@ void send_mp4_to_client(char index, hal_vidstream *stream, char isH265) {
             printf("NAL: %s received in packet %d\n", nal_type_to_str(pack->nalu[j].type), i);
             printf("     starts at %p, ends at %p\n", pack_data + pack->nalu[j].offset, pack_data + pack->nalu[j].offset + pack->nalu[j].length);
 #endif
-            if ((pack->nalu[j].type == NalUnitType_SPS || pack->nalu[j].type == NalUnitType_SPS_HEVC) 
+            if ((pack->nalu[j].type == NalUnitType_SPS || pack->nalu[j].type == NalUnitType_SPS_HEVC)
                 && pack->nalu[j].length >= 4 && pack->nalu[j].length <= UINT16_MAX)
                 mp4_set_sps(pack_data + pack->nalu[j].offset + 4, pack->nalu[j].length - 4, isH265);
             else if ((pack->nalu[j].type == NalUnitType_PPS || pack->nalu[j].type == NalUnitType_PPS_HEVC)
@@ -1160,7 +1160,7 @@ void respond_request(http_request_t *req) {
             "\r\n"
             "{\"active\":%s,\"manual\":%s,\"grayscale\":%s,\"ircut\":%s,\"ircut_pin1\":%d,\"ircut_pin2\":%d,"
             "\"irled\":%s,\"irled_pin\":%d,\"irsense_pin\":%d,\"adc_device\":\"%s\",\"adc_threshold\":%d}",
-            app_config.night_mode_enable ? "true" : "false", night_manual_on() ? "true" : "false", 
+            app_config.night_mode_enable ? "true" : "false", night_manual_on() ? "true" : "false",
             night_grayscale_on() ? "true" : "false",
             night_ircut_on() ? "true" : "false", app_config.ir_cut_pin1, app_config.ir_cut_pin2,
             night_irled_on() ? "true" : "false", app_config.ir_led_pin, app_config.ir_sensor_pin,
@@ -1192,7 +1192,7 @@ void respond_request(http_request_t *req) {
 
                 char path[32];
 
-                if (!memcmp(payloadb, "\x89\x50\x4E\x47\xD\xA\x1A\xA", 8)) 
+                if (!memcmp(payloadb, "\x89\x50\x4E\x47\xD\xA\x1A\xA", 8))
                     sprintf(path, "/tmp/osd%d.png", id);
                 else
                     sprintf(path, "/tmp/osd%d.bmp", id);
@@ -1350,7 +1350,7 @@ void respond_request(http_request_t *req) {
             "{\"recording\":%s,\"start_time\":\"%s\",\"continuous\":%s,\"path\":\"%s\","
             "\"filename\":\"%s\",\"segment_duration\":%d,\"segment_size\":%d}",
                 recordOn ? "true" : "false", start_time, app_config.record_continuous ? "true" : "false",
-                app_config.record_path, app_config.record_filename, 
+                app_config.record_path, app_config.record_filename,
                 app_config.record_segment_duration, app_config.record_segment_size);
         send_and_close(req->clntFd, response, respLen);
         return;
@@ -1376,7 +1376,7 @@ void respond_request(http_request_t *req) {
             "\r\n"
             "{\"chip\":\"%s\",\"loadavg\":[%.2f,%.2f,%.2f],\"memory\":\"%s\","
             "\"sensor\":\"%s\",\"temp\":\"%.1f\u00B0C\",\"uptime\":\"%s\"}",
-            chip, si.loads[0] / 65536.0, si.loads[1] / 65536.0, si.loads[2] / 65536.0, 
+            chip, si.loads[0] / 65536.0, si.loads[1] / 65536.0, si.loads[2] / 65536.0,
             memory, sensor, hal_temperature_read(), uptime);
         send_and_close(req->clntFd, response, respLen);
         return;
@@ -1497,4 +1497,4 @@ int stop_server() {
     HAL_INFO("server", "Shutting down server...\n");
 
     return EXIT_SUCCESS;
-}
+}
diff --git a/src/server.h b/src/server.h
@@ -37,4 +37,4 @@ void send_mjpeg_to_client(char index, char *buf, ssize_t size);
 void send_h26x_to_client(char index, hal_vidstream *stream);
 void send_mp3_to_client(char *buf, ssize_t size);
 void send_mp4_to_client(char index, hal_vidstream *stream, char isH265);
-void send_pcm_to_client(hal_audframe *frame);
+void send_pcm_to_client(hal_audframe *frame);

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ float __expf_finite(float x) { return expf(x); }`
`55`	`55`	`int __fgetc_unlocked(FILE *stream) { return fgetc(stream); }`
`56`	`56`	`double __log_finite(double x) { return log(x); }`
`57`	`57`
`58`		`-#if !defined(__riscv) && !defined(__riscv__)`
	`58`	`+#if defined(__arm__) \|\| defined(__aarch64__) \|\| defined(__mips__)`
`59`	`59`	`void mmap(void start, size_t len, int prot, int flags, int fd, uint32_t off) {`
`60`	`60`	`return (void*)syscall(SYS_mmap2, start, len, prot, flags, fd, off >> 12);`
`61`	`61`	`}`