re-worked makefile. FEC enable/disable flag for EDI2ETI.

Author: piratfm

Makefile

@@ -1,44 +1,54 @@
-
-
-CFLAGS=-O2 -I.
-LDFLAGS=-lm
+CC = gcc
+CFLAGS =-O2 -Wall
+OBJS_EDI2ETI = network.o af_parser.o pf_parser.o tag_parser.o crc.o eti_assembler.o logging.o edi2eti.o
+OBJS_TS2NA = ts2na.o
+OBJS_TS2NA_DREAMBOX = ts2na.o tune.o
+OBJS_NA2NI = na2ni.o
+OBJS_NI2HTTP = ni2http.o wffigproc.o wfficproc.o wfbyteops.o wftables.o wffirecrc.o wfcrc.o parse_config.o
+CFLAGS+=-I. -Ilibshout-2.2.2/include
+LDFLAGS+=-lm
 
 
 #####################################################
 # Uncomment this 2 lines if you want to enable ZeroMQ
 #####################################################
-#CFLAGS+= -DHAVE_ZMQ
-#ZMQ_LDFLAGS:= -lzmq
+CFLAGS+= -DHAVE_ZMQ
+LDFLAGS+= -lzmq
 
 
 ##################################################
 # Uncomment this 2 lines if you want to enable FEC
 ##################################################
 #CFLAGS+= -DHAVE_FEC
-#FEC_LDFLAGS:= -lfec
+#LDFLAGS+= -lfec
+
+
+all: cleanapps ni2http  ts2na na2ni edi2eti
 
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-all: cleanapps ts2na na2ni ni2http edi2eti
+edi2eti: $(OBJS_EDI2ETI)
+	$(CC) -o $@ $(OBJS_EDI2ETI) $(LDFLAGS)
 
-edi2eti:
-	gcc -g $(CFLAGS) -Wall -o edi2eti network.c af_parser.c pf_parser.c tag_parser.c crc.c eti_assembler.c logging.c edi2eti.c -lfec -lzmq
+ts2na: $(OBJS_TS2NA)
+	$(CC) -o $@ $(OBJS_TS2NA) $(LDFLAGS)
 
-ts2na:
-	gcc -g $(CFLAGS) -Wall -o ts2na ts2na.c
+ts2na_dreambox: $(OBJS_TS2NA_DREAMBOX)
+	$(CC) -o $@ $(OBJS_TS2NA_DREAMBOX) $(LDFLAGS)
 
-ts2na_dreambox:
-	gcc -g $(CFLAGS) -Wall -o ts2na ts2na.c tune.c
+na2ni: $(OBJS_NA2NI)
+	$(CC) -o $@ $(OBJS_NA2NI) $(LDFLAGS)
 
-na2ni:
-	gcc -g $(CFLAGS) -Wall -o na2ni na2ni.c $(LDFLAGS) $(FEC_LDFLAGS)
+ni2http: libshout-2.2.2/src/.libs/libshout.a $(OBJS_NI2HTTP)
+	$(CC) -o $@ $(OBJS_NI2HTTP) libshout-2.2.2/src/.libs/libshout.a -lpthread $(LDFLAGS)
 
-ni2http:
-	test -f ./libshout-2.2.2/src/.libs/libshout.a || { tar -xvzf libshout-2.2.2.tar.gz; cd libshout-2.2.2; ./configure --enable-shared=no --enable-static=yes; make; cd ..; }
-	gcc -g $(CFLAGS) -Wall -o ni2http ni2http.c wffigproc.c wfficproc.c wfbyteops.c wftables.c wffirecrc.c wfcrc.c parse_config.c $(LDFLAGS) -I./libshout-2.2.2/include ./libshout-2.2.2/src/.libs/libshout.a -lpthread  $(FEC_LDFLAGS) $(ZMQ_LDFLAGS)
+libshout-2.2.2/src/.libs/libshout.a:
+	tar -xvzf libshout-2.2.2.tar.gz; cd libshout-2.2.2; ./configure --enable-shared=no --enable-static=yes; make; cd ..;
 
 cleanapps:
-		rm -f *.o
-		rm -f ts2na na2ni ni2http edi2eti
+	rm -f $(OBJS_EDI2ETI) $(OBJS_TS2NA) $(OBJS_TS2NA_DREAMBOX) $(OBJS_NA2NI) $(OBJS_NI2HTTP)
+	rm -f ts2na na2ni ni2http edi2eti
 
 clean: cleanapps
-		if [ -f ./libshout-2.2.2/src/.libs/libshout.a ]; then cd libshout-2.2.2; make clean; cd ..;  fi;
+	if [ -f ./libshout-2.2.2/src/.libs/libshout.a ]; then cd libshout-2.2.2; make clean; cd ..;  fi;

af_parser.c

@@ -14,7 +14,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
+#ifdef HAVE_FEC
 #include <fec.h>
+#endif
 
 #include "edi_parser.h"
 #include "crc.h"
@@ -28,7 +30,9 @@ edi_handler_t *initEDIHandle(int fmt, callback_t outCallback, void *priv_data)
 	edi_handler_t *h = calloc(1, sizeof(edi_handler_t));
 	h->eti_format = fmt;
 
+#ifdef HAVE_FEC
 	h->afb.m_rs_handler = init_rs_char(8, 0x11d, 1, 1, 255 - 207, ((1 << 8) - 1) - 255);
+#endif
 	h->write_cb = outCallback;
 	h->write_cb_priv = priv_data;
 	return h;
@@ -40,8 +44,9 @@ void closeEDIHandle(edi_handler_t *h)
 	msg_Log("EDI: stats: packets lost: %u/%u errors:%u/%u",
 			h->afb.PktLost, h->afb.PktCount, h->afb.errorsCorrected, h->afb.PktCount*h->afb.Plen);
 	if(h) {
+#ifdef HAVE_FEC
 		free_rs_char(h->afb.m_rs_handler);
-
+#endif
 		for(i=0;i<64;i++) {
 			if(h->eti.m_stc[i].mst) {
 				free(h->eti.m_stc[i].mst);
@@ -101,20 +106,9 @@ static int HandleAFPacket(edi_handler_t *h, uint8_t *edi_pkt, uint32_t pktsize)
     	msg_Log("EDI-AF: packet not supported, has no CRC");
         return -1;
     }
-#if 0
-    uint16_t crc = 0xffff;
-    for (i = 0; i < AFPACKET_HEADER_LEN + taglength; i++) {
-        crc = crc16(crc, &edi_pkt[i], 1);
-    }
-    crc ^= 0xffff;
-
-    uint16_t packet_crc = read_16b(edi_pkt + AFPACKET_HEADER_LEN + taglength);
-
-#endif
-	//msg_Dump(edi_pkt , pktsize);
 
-    //bool ok = checkCRC(edi_pkt, AFPACKET_HEADER_LEN + taglength + crclength);
-	bool ok = checkCRC(edi_pkt, AFPACKET_HEADER_LEN + taglength + crclength);
+    //this is checked at the second time if PS is used
+    bool ok = checkCRC(edi_pkt, AFPACKET_HEADER_LEN + taglength + crclength);
 
     if (!ok) {
     	msg_Log("EDI-AF: Packet crc wrong pos:%u max:%u", AFPACKET_HEADER_LEN + taglength, pktsize);

edi2eti.c

@@ -19,7 +19,9 @@
 #include "network.h"
 #include "logging.h"
 
+#ifdef HAVE_ZMQ
 #include <zmq.h>
+#endif
 
 #define VERSION_ID "$Rev$"
 #define DEFAULT_TTL 16
@@ -41,18 +43,38 @@ char *ip = DEFAULT_HOST;
 static void usage(char *name) {
 	fprintf(
 			stderr,
-			"%s udp unicast/multicast tester.\n"
+			"%s udp unicast/multicast EDI-to-ETI coverter.\n"
 				"This is UDP unicast/multicast EDI-stream receiver that converts received stream to ETI-format %s.\n"
 				"Usage: %s [options] [address]:[port]\n"
-				"-v, --verbose           : Show more info (default: no)\n"
-				"-q, --quiet             : Minimum info (default: no)\n"
-				"-I, --interval <value>  : Application udp reception interval\n"
-				"-o, --output <file|url> : Output file path or zeromq url (default: stdout)\n"
-				"-a, --activity          : Dislay activity cursor (default: no)\n"
-				"-h, --help              : Show this help\n"
+				"-v, --verbose               : Show more info (default: no)\n"
+				"-q, --quiet                 : Minimum info (default: no)\n"
+				"-I, --interval <value>      : Application udp reception time in seconds. Exit after that. (default:run forever)\n"
+#ifdef HAVE_ZMQ
+				"-o, --output <file|zmq-url> : Output file path or zeromq url (default: stdout)\n"
+				"-L, --no-align              : Disable eti-packets alignment for ZeroMQ packing\n"
+#else
+				"-o, --output <file>         : Output file path (default: stdout)\n"
+#endif
+				"-a, --activity              : Dislay activity cursor (default: no)\n"
+				"-h, --help                  : Show this help\n"
 				"\n", name, VERSION_ID, name);
 }
 
+static void build_info(char *name) {
+	fprintf(stderr, "ZeroMQ:%s, FEC:%s\n",
+#ifdef HAVE_ZMQ
+		"enabled",
+#else
+		"disabled",
+#endif
+#ifdef HAVE_FEC
+		"enabled"
+#else
+		"disabled"
+#endif
+	);
+}
+
 static void signal_handler(int signum) {
 	//    if (signum != SIGPIPE) {
 	if (signum != SIGPIPE) {
@@ -80,6 +102,7 @@ void write_file(void *privData, void *etiData, int etiLen)
 
 
 
+#ifdef HAVE_ZMQ
 
 #define NUM_FRAMES_PER_ZMQ_MESSAGE 4
 
@@ -98,13 +121,17 @@ typedef struct {
 int is_initial = 1;
 zmq_dab_message_t zmq_msg;
 int zmq_msg_ix;
+int zmq_align = 1;
 
 void write_zmq(void *privData, void *etiData, int etiLen)
 {
-	int i;
-	if(verbosity > 1)
-		msg_Log("write:%u bytes to zmq part: %d", etiLen, zmq_msg_ix);
-	int offset = 0;
+    int i;
+    int offset = 0;
+    uint8_t *etiPkt = (uint8_t *) etiData;
+
+    if(verbosity > 1)
+        msg_Log("write:%u bytes to zmq part: %d", etiLen, zmq_msg_ix);
+
     // Increment the offset by the accumulated frame offsets
     for (i = 0; i < zmq_msg_ix; i++) {
         offset += zmq_msg.buflen[i];
@@ -115,8 +142,18 @@ void write_zmq(void *privData, void *etiData, int etiLen)
     	return;
     }
 
+    if(etiLen < 16 || (zmq_align && zmq_msg_ix != ((etiPkt[6] >> 5) & 0x03))) {
+        zmq_msg_ix=0;
+        zmq_msg.buflen[0] = -1;
+        zmq_msg.buflen[1] = -1;
+        zmq_msg.buflen[2] = -1;
+        zmq_msg.buflen[3] = -1;
+        msg_Log("ZMQ: skip non-aligned frames: %02x != %02x", zmq_msg_ix, ((etiPkt[6] >> 5) & 0x03));
+        return;
+    }
+
     // Append the new frame to our message
-    memcpy(zmq_msg.buf + offset, etiData, etiLen);
+    memcpy(zmq_msg.buf + offset, etiPkt, etiLen);
     zmq_msg.buflen[zmq_msg_ix] = etiLen;
     zmq_msg_ix++;
 
@@ -142,7 +179,7 @@ void write_zmq(void *privData, void *etiData, int etiLen)
         }
     }
 }
-
+#endif
 
 
 int main(int argc, char **argv) {
@@ -153,26 +190,30 @@ int main(int argc, char **argv) {
 	int port = DEFAULT_PORT;
 	int activity=0;
 	edi_handler_t *edi_p=NULL;
+#ifdef HAVE_ZMQ
 	void *zmq_context = NULL;
 	void *zmq_publisher = NULL;
+#endif
 
 	/******************************************************
 	 * Getopt
 	 ******************************************************/
-	const char short_options[] = "vaqhI:o:";
+	const char short_options[] = "vLaqhI:o:";
 	const struct option long_options[] = {
 			{ "interval", optional_argument, NULL, 'I' },
 			{ "verbose", optional_argument, NULL, 'v' },
 			{ "quiet", optional_argument, NULL,	'q' },
 			{ "output", optional_argument, NULL, 'o' },
 			{ "activity", optional_argument, NULL, 'a' },
+			{ "no-align", no_argument, NULL, 'L' },
 			{ "help", no_argument, NULL, 'h' },
 			{ 0, 0, 0, 0 }
 		};
 	int c, option_index = 0;
 
 	if (argc == 1) {
 		usage(argv[0]);
+		build_info(argv[0]);
 		exit(-1);
 	}
 
@@ -192,7 +233,11 @@ int main(int argc, char **argv) {
 		case 'a':
 			activity++;
 			break;
-
+#ifdef HAVE_ZMQ
+		case 'L':
+			zmq_align=0;
+			break;
+#endif
 		case 'I':
 			timeout = atoi(optarg);
 			break;
@@ -203,19 +248,25 @@ int main(int argc, char **argv) {
 
 		case 'h':
 			usage(argv[0]);
+			build_info(argv[0]);
 			exit(0);
 			break;
 		}
 	}
 
+	if(verbosity > 0)
+		build_info(argv[0]);
+
 	if (argc <= optind) {
 		if (verbosity > 0)
 			msg_Log("need to specify ip:port a:%d, o:%d", argc, optind);
 		exit(-1);
 	}
 
+
 	if(outpath) {
 		if(strncmp("zmq+", outpath, 4) == 0 && strlen(outpath) > 10) {
+#ifdef HAVE_ZMQ
 			zmq_context = zmq_ctx_new ();
 			zmq_publisher = zmq_socket (zmq_context, ZMQ_PUB);
 			zmq_bind (zmq_publisher, outpath+4);
@@ -226,8 +277,13 @@ int main(int argc, char **argv) {
 			zmq_msg.buflen[3] = -1;
 			zmq_msg.version = 1;
 			zmq_msg_ix=0;
+#else
+			msg_Log("ZEROMQ is disabled! Can't stream to specified destination: %s", outpath);
+			exit(-1);
+#endif
 
-		} else {
+		} else
+		{
 			out_fh = fopen(outpath, "wb");
 			edi_p = initEDIHandle(ETI_FMT_RAW, write_file, out_fh);
 		}
@@ -322,10 +378,12 @@ int main(int argc, char **argv) {
 	sock = 0;
 	free(buff);
 
+#ifdef HAVE_ZMQ
 	if(zmq_publisher)
 	    zmq_close (zmq_publisher);
 	if(zmq_context)
 	    zmq_term (zmq_context);
+#endif
 
 	return 1;
 }

ni2http.c

@@ -638,7 +638,7 @@ int process_dabplus(uint8_t *data_ptr, int data_len, ni2http_channel_t *chan)
 				cbuf[j] = chan->dabplus_data[s * j + i];
 #ifdef HAVE_FEC
 			int errs = decode_rs_char(chan->dabplus_rs, cbuf, (int*)NULL, 0);
-			/* fprintf(stderr,"errs = %d\n",errs);*/
+			if(errs!=0) fprintf(stderr,"DAB+ errors: %d\n",errs);
 #endif
 			/* Write checked/corrected data back to sfbuf */
 			for (j = 0; j < 110; j++)

pf_parser.c

@@ -14,7 +14,9 @@
 #include <unistd.h>
 #include <ctype.h>
 
+#ifdef HAVE_FEC
 #include <fec.h>
+#endif
 
 #include "edi_parser.h"
 #include "crc.h"
@@ -167,12 +169,15 @@ static bool decodePFTFrags(struct afBuilders *afb, uint8_t _pseqIdx, uint32_t *e
 				fprintf(stderr, "\n");
 			}
 #endif
+
+#ifdef HAVE_FEC
 			//int errors_corrected = fec_decode(chunk, erasures[i], cnt);
 			int num_err = decode_rs_char(afb->m_rs_handler, chunk, erasures[i], erasures_cnt);
 			if (num_err == -1) {
 				msg_Log("Too many errors in FEC %d", erasures_cnt);
 				return false;
 			}
+#endif
 
 			//if(num_err) {
 			//	fprintf(stderr, "corrected %d errors of %d\n", num_err, erasures_cnt);
@@ -183,6 +188,7 @@ static bool decodePFTFrags(struct afBuilders *afb, uint8_t _pseqIdx, uint32_t *e
 
 		//TODO: increase afb->bytesCollected
 		_afSingle->bytesCollected = (afb->_cmax)*afb->RSk - afb->RSz;
+
 	} else {
 		//afb->afPacket = _afSingle->pfPackets;
 		memcpy(afb->afPacket, _afSingle->pfPackets, afb->Fcount*afb->Plen);
@@ -302,6 +308,9 @@ int pushPFTFrag(struct pfPkt *pf, struct afBuilders *afb)
 			/* Receiving _rxmin fragments does not guarantee that decoding
 			 * will succeed! */
 			afb->_rxmin = afb->Fcount - (afb->_cmax*48)/afb->Plen;
+#ifndef HAVE_FEC
+			msg_Log("FEC is disabled in this application. Lost packets will not be recovered!");
+#endif
 		} else {
 			afb->_rxmin = afb->Fcount;
 			afb->rs_block=NULL;