[Initng-svn] r4383 - initng/trunk/plugins/service_file

[svn at initng.thinktux.net]

Author: jimmy
Date: Wed Jun  7 11:05:41 2006
New Revision: 4383

Modified:
   initng/trunk/plugins/service_file/bp.c
   initng/trunk/plugins/service_file/initng_service_file.c
   initng/trunk/plugins/service_file/initng_service_file.h

Log:
Finnaly got it right.


Modified: initng/trunk/plugins/service_file/bp.c
==============================================================================
--- initng/trunk/plugins/service_file/bp.c	(original)
+++ initng/trunk/plugins/service_file/bp.c	Wed Jun  7 11:05:41 2006
@@ -416,7 +416,7 @@
 	memset(&rep, 0, sizeof(bp_rep));
 
 	assert(to_send);
-	to_send->version = BASH_PARSER_VERSION;
+	to_send->version = SERVICE_FILE_VERSION;
 
 	/* check if we can use fd 3 to talk to initng */
 	if (fcntl(sock, F_GETFD) < 0)

Modified: initng/trunk/plugins/service_file/initng_service_file.c
==============================================================================
--- initng/trunk/plugins/service_file/initng_service_file.c	(original)
+++ initng/trunk/plugins/service_file/initng_service_file.c	Wed Jun  7 11:05:41 2006
@@ -54,7 +54,7 @@
 
 #include <initng-paths.h>
 
-#include "initng_bash_parser.h"
+#include "initng_service_file.h"
 
 INITNG_PLUGIN_MACRO;
 
@@ -77,7 +77,7 @@
 
 #define SOCKET_4_ROOTPATH "/dev/initng"
 
-a_state_h PARSING = { "PARSING", "This is service is parsing by bash_parser.", IS_STARTING, NULL, NULL, NULL };
+a_state_h PARSING = { "PARSING", "This is service is parsing by service_file.", IS_STARTING, NULL, NULL, NULL };
 a_state_h REDY_TO_START = { "REDY_TO_START", "This service is finished loading.", IS_DOWN, NULL, NULL, NULL };
 a_state_h PARSE_FAIL = { "PARSE_FAIL", "This parse process failed.", IS_FAILED, NULL, NULL, NULL };
 
@@ -128,7 +128,7 @@
 
 	if (r != (signed) sizeof(bp_req))
 	{
-		F_("Could not read incomming bash_parser req.\n");
+		F_("Could not read incomming service_file req.\n");
 		strcpy(rep.message, "Unable to read request");
 		rep.success = FALSE;
 		SEND();
@@ -137,7 +137,7 @@
 	D_("Got a request: ver: %i, type: %i\n", req.version, req.request);
 
 	/* check protocol version match */
-	if (req.version != BASH_PARSER_VERSION)
+	if (req.version != SERVICE_FILE_VERSION)
 	{
 		strcpy(rep.message, "Bad protocol version");
 		rep.success = FALSE;

Modified: initng/trunk/plugins/service_file/initng_service_file.h
==============================================================================
--- initng/trunk/plugins/service_file/initng_service_file.h	(original)
+++ initng/trunk/plugins/service_file/initng_service_file.h	Wed Jun  7 11:05:41 2006
@@ -17,10 +17,10 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef BASH_PARSER_H
-#define BASH_PARSER_H
+#ifndef SERVICE_FILE_H
+#define SERVICE_FILE_H
 
-#define BASH_PARSER_VERSION 1
+#define SERVICE_FILE_VERSION 1
 #define SOCKET_PATH "/dev/initng/bp"
 #define SCRIPT_PATH "/etc/init"