From 3c441b89aae68de118a68248ed5f9001fc74a4b7 Mon Sep 17 00:00:00 2001
From: "Jean-Marc Pigeon (Delson)" <jmp@safe.ca>
Date: Sun, 4 May 2025 20:50:59 -0400
Subject: [PATCH] Certificates are defining within config file

---
 Makefile             | 16 ++++++++++------
 app/feeder.c         |  4 +++-
 conf/feeder.conf.dvl |  6 ++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 190069c..74edd0e 100644
--- a/Makefile
+++ b/Makefile
@@ -40,8 +40,6 @@ TESTITER=	3
 #testing feed
 FEEDPAR	=						\
 		-d3					\
-	   	-c ./conf/feeder.conf.dvl		\
-		$(TESTIP)				\
 		$(TESTPORT)				\
 		$(TESTDIR)/$(DATATST)/feed*.tst		\
 
@@ -50,14 +48,16 @@ extfeed	:	debug
 		@ bin/feeder				\
 			-f				\
 			-d3				\
+	   		-c ./conf/feeder.conf.dvl	\
 			$(EXTIP)			\
 			$(EXTPORT)			\
 		  	$(DATATST)/extfeed00.tst
 
 onefeed	:	debug
-		@ bin/feeder				\
+		 bin/feeder				\
 			-f				\
 			-d2				\
+	   		-c ./conf/feeder.conf.dvl	\
 			$(TESTIP)			\
 			$(TESTPORT)			\
 		  	$(DATATST)/feed00.tst
@@ -70,9 +70,13 @@ tstfeed	:	debug
 dbgfeed	:	debug
 		@ gdb --args				\
 			bin/feeder			\
-				$(TESTIP)		\
-				$(TESTPORT)		\
-		  		$(DATATST)/feed00.tst
+			  -f				\
+			  -d2				\
+			  -c ./conf/feeder.conf.dvl	\
+			  $(TESTIP)			\
+			  $(TESTPORT)			\
+			  $(DATATST)/feed00.tst
+
 #testing TLS connection
 tlsrcvr	:	
 		@ clear
diff --git a/app/feeder.c b/app/feeder.c
index 21931a4..f9a4553 100644
--- a/app/feeder.c
+++ b/app/feeder.c
@@ -518,7 +518,7 @@ while (proceed==true) {
   //(void) fprintf(stdout,"JMPDBG main phase='%d'\n",phase);
   switch (phase) {
     case 0      :       //checking parameters
-      if ((params=par_getparams(argc,argv,"d:fh:r:v"))==(ARGTYP *)0) {
+      if ((params=par_getparams(argc,argv,"c:d:fh:r:v"))==(ARGTYP *)0) {
         proceed=false;      //no need to go further
         }
       break;
@@ -530,6 +530,7 @@ while (proceed==true) {
         }
       break;
     case 2      :       //opening remote channel
+      (void)  rou_loadconfig(config,true);
       (void) openlog("feeder",LOG_NDELAY|LOG_PID,LOG_DAEMON);
       numfile=scanallfiles(params->argc,params->argv);
       if (numfile==(params->argc-2))
@@ -539,6 +540,7 @@ while (proceed==true) {
       break;
     default     :       //end of task
       params=par_freeparams(params);
+      (void)  rou_loadconfig(config,false);
       proceed=false;
       break;
     }
diff --git a/conf/feeder.conf.dvl b/conf/feeder.conf.dvl
index 0630506..97277eb 100644
--- a/conf/feeder.conf.dvl
+++ b/conf/feeder.conf.dvl
@@ -1 +1,7 @@
 #file used to set environement configuration
+#------------------------------------------------
+#Defining feeder Certificate
+CA_ROOT	=	"./certs/root-safe_CA.pem"
+CA_CERT	=	"./certs/localhost-chain-cert.pem"
+CA_KEY	=	"./certs/localhost-key.pem"
+#------------------------------------------------
-- 
2.47.3