@@ -174,6 +174,8 @@ FIFO fifo

 FIFO_DIR  fifo_dir

 FIFO_MODE fifo_mode

 FIFO_DB_URL fifo_db_url

+UNIX_SOCK unix_sock

+UNIX_SOCK_CHILDREN unix_sock_children

 AVP_DB_URL  avp_db_url

 SERVER_SIGNATURE server_signature

 REPLY_TO_VIA reply_to_via

@@ -366,6 +368,8 @@ EAT_ABLE	[\ \t\b\r]

 <INITIAL>{FIFO_DIR}	{ count(); yylval.strval=yytext; return FIFO_DIR; }

 <INITIAL>{FIFO_DB_URL}	{ count(); yylval.strval=yytext; return FIFO_DB_URL; }

 <INITIAL>{FIFO_MODE}	{ count(); yylval.strval=yytext; return FIFO_MODE; }

+<INITIAL>{UNIX_SOCK} { count(); yylval.strval=yytext; return UNIX_SOCK; }

+<INITIAL>{UNIX_SOCK_CHILDREN} { count(); yylval.strval=yytext; return UNIX_SOCK_CHILDREN; }

 <INITIAL>{AVP_DB_URL}	{ count(); yylval.strval=yytext; return AVP_DB_URL; }

 <INITIAL>{SERVER_SIGNATURE}	{ count(); yylval.strval=yytext; return SERVER_SIGNATURE; }

 <INITIAL>{REPLY_TO_VIA}	{ count(); yylval.strval=yytext; return REPLY_TO_VIA; }

@@ -199,6 +199,8 @@ static struct id_list* mk_listen_id(char*, int, int);

 %token FIFO_DIR

 %token FIFO_MODE

 %token FIFO_DB_URL

+%token UNIX_SOCK

+%token UNIX_SOCK_CHILDREN

 %token AVP_DB_URL

 %token SERVER_SIGNATURE

 %token REPLY_TO_VIA

@@ -408,6 +410,10 @@ assign_stm:	DEBUG EQUAL NUMBER { debug=$3; }

 		| FIFO_MODE EQUAL error { yyerror("int value expected"); }

 		| FIFO_DB_URL EQUAL STRING { fifo_db_url=$3; }

 		| FIFO_DB_URL EQUAL error  { yyerror("string value expected"); }

+                | UNIX_SOCK EQUAL STRING { unixsock_name=$3; }

+                | UNIX_SOCK EQUAL error { yyerror("string value expected"); }

+                | UNIX_SOCK_CHILDREN EQUAL NUMBER { unixsock_children=$3; }

+                | UNIX_SOCK_CHILDREN EQUAL error { yyerror("int value expected\n"); }

 		| AVP_DB_URL EQUAL STRING { avp_db_url=$3; }

 		| AVP_DB_URL EQUAL error  { yyerror("string value expected"); }

 		| USER EQUAL STRING     { user=$3; }

@@ -107,6 +107,10 @@ extern int fifo_mode;

 char extern *fifo_dir; /* dir. where  reply fifos are allowed */

 extern char *fifo_db_url;  /* db url used by db_fifo interface */

+/* UNIX domain socket configuration */

+extern char *unixsock_name;   /* The name of the socket */

+extern int unixsock_children; /* The number of listening children */

+

 /* AVP configuration */

 extern char *avp_db_url;  /* db url used by user preferences (AVPs) */

@@ -94,6 +94,7 @@

 #include "parser/parse_hname2.h"

 #include "parser/digest/digest_parser.h"

 #include "fifo_server.h"

+#include "unixsock_server.h"

 #include "usr_avp.h"

 #include "name_alias.h"

 #include "hash_func.h"

@@ -231,7 +232,8 @@ Options:\n\

     -u uid       Change uid \n\

     -g gid       Change gid \n\

     -P file      Create a pid file\n\

-    -i fifo_path Create a fifo (usefull for monitoring " NAME ") \n"

+    -i fifo_path Create a fifo (usefull for monitoring " NAME ") \n\

+    -x socket    Create a unix domain socket \n"

 #ifdef STATS

 "    -s file     File to which statistics is dumped (disabled otherwise)\n"

 #endif

@@ -404,6 +406,7 @@ void cleanup(show_status)

 	destroy_tls();

 #endif

 	destroy_timer();

+	close_unixsock_server();

 	destroy_fifo();

 	destroy_script_cb();

 #ifdef PKG_MALLOC

@@ -830,6 +833,13 @@ int main_loop()

 			LOG(L_ERR, "opening fifo server failed\n");

 			goto error;

 		}

+

+		     /* Initialize Unix domain socket server */

+		if (init_unixsock_server()<0) {

+			LOG(L_ERR, "Error while initializing Unix domain socket server\n");

+			goto error;

+		}

+

 		/* main process, receive loop */

 		process_no=0; /*main process number*/

 		pt[process_no].pid=getpid();

@@ -973,6 +983,12 @@ int main_loop()

 		goto error;

 	}

+	     /* Initialize Unix domain socket server */

+	if (init_unixsock_server()<0) {

+		LOG(L_ERR, "Error while initializing Unix domain socket server\n");

+		goto error;

+	}

+

 #ifdef USE_TCP

 	/* if we are using tcp we always need the timer */

 	if ((!tcp_disable)||(timer_list))

@@ -1130,7 +1146,7 @@ int main(int argc, char** argv)

 #ifdef STATS

 	"s:"

 #endif

-	"f:cp:m:b:l:n:N:rRvdDETVhw:t:u:g:P:i:";

+	"f:cp:m:b:l:n:N:rRvdDETVhw:t:u:g:P:i:x";

 	while((c=getopt(argc,argv,options))!=-1){

 		switch(c){

@@ -1256,6 +1272,9 @@ int main(int argc, char** argv)

 			case 'i':

 					fifo=optarg;

 					break;

+		        case 'x':

+				        unixsock_name=optarg;

+					break;

 			case '?':

 					if (isprint(optopt))

 						fprintf(stderr, "Unknown option `-%c�.\n", optopt);

@@ -65,6 +65,7 @@ typedef enum {

 #define PROC_TIMER    -1  /* Timer attendant process */

 #define PROC_FIFO     -2  /* FIFO attendant process */

 #define PROC_TCP_MAIN -4  /* TCP main process */

+#define PROC_UNIXSOCK -5  /* Unix domain socket server processes */

 #define MODULE_VERSION char *module_version=VERSION;