Try to fix broken stream after short read (reconnect directly)

tomcast.c

@@ -875,6 +875,7 @@ void * proxy_ts_stream(void *self) {
 
 	int http_code = 0;
 	while (1) {
+NEW_SOURCE:
 		r->conn_ts = 0;
 		r->read_bytes = 0;
 
@@ -917,8 +918,8 @@ void * proxy_ts_stream(void *self) {
 
 			// Fill short frame with NULL packets
 			if (readen < FRAME_PACKET_SIZE) {
-				//LOGf("DEBUG: Short read (%d) on retreamer srv_fd: %i | Channel: %s\n", readen, sock, chan->name);
-				memcpy(buf+readen, TS_NULL_FRAME+readen, FRAME_PACKET_SIZE - readen);
+				LOGf("DEBUG: Short read (%zd) on retreamer srv_fd: %i | Channel: %s Source: %s\n", readen, r->sock, r->channel->name, r->channel->source);
+				goto RECONNECT;
 			}
 			pthread_rwlock_wrlock(&r->lock);
 			r->read_bytes += readen;
@@ -944,7 +945,7 @@ void * proxy_ts_stream(void *self) {
 				}
 			}
 
-			written = fdwrite(r->clientsock, buf, FRAME_PACKET_SIZE);
+			written = fdwrite(r->clientsock, buf, readen);
 			if (written == -1) {
 				LOGf("PROXY: Error writing to dst_fd: %i on srv_fd: %i | Channel: %s Source: %s\n", r->clientsock, r->sock, r->channel->name, r->channel->source);
 				connect_destination(r);
@@ -953,6 +954,8 @@ void * proxy_ts_stream(void *self) {
 		LOGf("DEBUG: fdread timeout restreamer srv_fd: %i | Channel: %s\n", r->sock, r->channel->name);
 		proxy_set_status(r, "ERROR: Read timeout");
 RECONNECT:
+		if (send_reset_opt)
+			fdwrite(r->clientsock, reset, FRAME_PACKET_SIZE);
 		pthread_rwlock_wrlock(&r->lock);
 		r->conn_ts = 0;
 		pthread_rwlock_unlock(&r->lock);
@@ -960,7 +963,7 @@ RECONNECT:
 		proxy_set_status(r, "Reconnecting");
 		shutdown_fd(&(r->sock));
 		next_channel_source(r->channel);
-		continue;
+		goto NEW_SOURCE;
 QUIT:
 		LOGf("DEBUG: quit srv_fd: %i | Channel: %s\n", r->sock, r->channel->name);
 		break;