Commit: b4dc0c921ee782d841bc476470f28605529c03c2 - UltraMonkeyL7_v4_nakano (git)

Commit MetaInfo

• Revision: b4dc0c921ee782d841bc476470f28605529c03c2 (tree)
• Zeit: 2014-12-24 16:07:22
• Autor: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

2014/12/24 edit

Signed-off-by: Hiroaki Nakano <[e-mail]>

Ändern Zusammenfassung

• modified: include/l7vs_lsock.h
• modified: src/lsock.c
• modified: src/service.c

Diff

--- a/include/l7vs_lsock.h
+++ b/include/l7vs_lsock.h
@@ -50,6 +50,7 @@ struct	l7vs_dest;
 extern	int			l7vs_lsock_init();
 extern	void			l7vs_lsock_fini();
 extern	struct l7vs_lsock*	l7vs_lsock_get( struct sockaddr_in*, uint8_t, int );
+extern	struct l7vs_lsock*	l7vs_lsock_get_dummy( struct sockaddr_in*, uint8_t, int );
 extern	void			l7vs_lsock_put( struct l7vs_lsock* );
 extern	struct l7vs_lsock*	l7vs_lsock_table_lookup( struct sockaddr_in*, uint8_t );
 extern	void			l7vs_lsock_add_service( struct l7vs_lsock*, struct l7vs_service* );

--- a/src/lsock.c
+++ b/src/lsock.c
@@ -261,6 +261,92 @@ l7vs_lsock_get(struct sockaddr_in *sin, uint8_t proto, int backlog)
 }
 
 /*!
+ * look up infomation for socket
+ * return lsock structure without socket and iomux.
+ * 
+ * @param[in]   sin     socket address struct( if ipv6 may be change this struct ) 
+ * @param[in]   proto   TCS/UDP select.
+ * @param[in]   backlog
+ */
+struct l7vs_lsock *
+l7vs_lsock_get_dummy(struct sockaddr_in *sin, uint8_t proto, int backlog)
+{
+    struct l7vs_lsock *lsock;
+    int stype;
+    int ret;
+    int on = 1;
+
+    if (logger_get_log_level(LOG_CAT_L7VSD_SYSTEM_SOCKET) == LOG_LV_DEBUG) {
+        LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SYSTEM_SOCKET,20,
+            "in_fuction:  struct l7vs_lsock * l7vs_lsock_get_dummy(struct sockaddr_in *sin, uint8_t proto, int backlog)"
+            "*sin =%p :proto = %d :backlog = %d :",
+            sin,proto,backlog);
+    }
+
+    if (sin == NULL) {
+        return NULL;
+    }
+
+    lsock = l7vs_lsock_table_lookup(sin, proto);
+    if (lsock != NULL) {
+        lsock->refcnt++;
+        if (logger_get_log_level(LOG_CAT_L7VSD_SYSTEM_SOCKET) == LOG_LV_DEBUG) {
+            char lsock_str[DEBUG_STR_LEN] = {0};
+            l7vs_lsock_c_str(lsock_str, lsock);
+            LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SYSTEM_SOCKET,21,
+                "table look up: lsock=%s", lsock_str);
+        }
+        return lsock;
+    }
+
+    switch (proto) {
+    case IPPROTO_TCP:
+        stype = SOCK_STREAM;
+        break;
+    case IPPROTO_UDP:
+        stype = SOCK_DGRAM;
+        break;
+    default:
+        LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SYSTEM_SOCKET,21,
+            "Protocol number should be TCP or UDP (%d)", proto);
+        return NULL;
+    }
+
+    lsock = (struct l7vs_lsock *)calloc(1, sizeof(*lsock));
+    if (lsock == NULL) {
+        LOGGER_PUT_LOG_ERROR(LOG_CAT_L7VSD_SYSTEM_MEMORY,14, "Could not allocate lsock");
+        return lsock;
+    }
+    if (logger_get_log_level(LOG_CAT_L7VSD_SYSTEM_MEMORY) == LOG_LV_DEBUG) {
+        LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SYSTEM_MEMORY,6,
+            "in function l7vs_lsock_get: allocate memory"
+            " : size=%zu ,pointer=%p", sizeof(*lsock),lsock);
+    }
+
+    if (logger_get_log_level(LOG_CAT_L7VSD_SYSTEM_SOCKET) == LOG_LV_DEBUG) {
+        LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SYSTEM_SOCKET,22, "creating lsock %p", lsock);
+    }
+    lsock->proto = proto;
+
+    lsock->addr = *sin;
+
+    lsock->refcnt = 1;
+    lsock->fast_schedule = 1;
+
+    l7vs_lsock_table_add(lsock);  //Add socket in the list. It may be used for maintaining session (Am not sure)
+//    l7vs_iomux_add(&lsock->iom, L7VS_IOMUX_READ);
+
+    if (logger_get_log_level(LOG_CAT_L7VSD_SYSTEM_SOCKET) == LOG_LV_DEBUG) {
+        char lsock_str[DEBUG_STR_LEN] = {0};
+        l7vs_lsock_c_str(lsock_str, lsock);
+        LOGGER_PUT_LOG_DEBUG(LOG_CAT_L7VSD_SYSTEM_SOCKET,23,
+            "creat: lsock=%s", lsock_str);
+    }
+
+    return lsock;
+}
+
+/*!
  * lisning socket remove list and iomuxlist.
  * @param[in]   lsock   removing lisning socket
  * @return      void

--- a/src/service.c
+++ b/src/service.c
@@ -625,19 +625,23 @@ l7vs_service_list_dest_arg(struct l7vs_service *srv,
  * @return      int     number currently created / -1 failure
  */
 static l7vs_service *
-make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
+make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err, pid_t pid)
 {
     int ret;
 
-        struct l7vs_protomod *pmod;
-        struct l7vs_scheduler *sched;
-        struct l7vs_service *srv;
-        struct l7vs_lsock *lsock;
-	struct l7vs_dest *sorry_dest;	//! sorry-server destination
+    struct l7vs_protomod *pmod;
+    struct l7vs_scheduler *sched;
+    struct l7vs_service *srv;
+    struct l7vs_lsock *lsock;
+    struct l7vs_dest *sorry_dest;	//! sorry-server destination
 //	struct l7vs_service_repdata *	service_replicationdata;
 
     /* ソケット作成 */
-    lsock = l7vs_lsock_get(&arg->srv_arg.addr, arg->srv_arg.proto, arg->srv_arg.backlog);
+    if(pid == 0)
+        lsock = l7vs_lsock_get(&arg->srv_arg.addr, arg->srv_arg.proto, arg->srv_arg.backlog);
+    else
+        lsock = l7vs_lsock_get_dummy(&arg->srv_arg.addr, arg->srv_arg.proto, arg->srv_arg.backlog);
+
     if(lsock == NULL) {
         LOGGER_PUT_LOG_ERROR( LOG_CAT_L7VSD_VIRTUAL_SERVICE,1, "Could not create listen socket" );
         *err = L7VS_CONFIG_ERR_NOSOCK;
@@ -654,7 +658,7 @@ make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
     /* プロトコルモジュールロード */
     pmod = l7vs_protomod_get(arg->srv_arg.protomod);
     if (pmod == NULL) {
-        l7vs_lsock_put(lsock);
+        if(pid==0) l7vs_lsock_put(lsock);
         *err = L7VS_CONFIG_ERR_NOMEM;
         //debug output
         if( LOG_LV_DEBUG == logger_get_log_level( LOG_CAT_L7VSD_VIRTUAL_SERVICE ) ){
@@ -670,7 +674,7 @@ make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
     sched = l7vs_sched_get(arg->srv_arg.schedmod);
     if (sched == NULL) {
         l7vs_protomod_put(pmod);
-        l7vs_lsock_put(lsock);
+        if(pid==0) l7vs_lsock_put(lsock);
         *err = L7VS_CONFIG_ERR_NOSCHED;
         //debug output
         if( LOG_LV_DEBUG == logger_get_log_level( LOG_CAT_L7VSD_VIRTUAL_SERVICE ) ){
@@ -688,7 +692,7 @@ make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
     if (sorry_dest == NULL) {
         l7vs_sched_put(sched);
         l7vs_protomod_put(pmod);
-        l7vs_lsock_put(lsock);
+        if(pid==0) l7vs_lsock_put(lsock);
         *err = L7VS_CONFIG_ERR_NOMEM;
         //debug output
         if( LOG_LV_DEBUG == logger_get_log_level( LOG_CAT_L7VSD_VIRTUAL_SERVICE ) ){
@@ -706,7 +710,7 @@ make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
         l7vs_dest_destroy(sorry_dest);
         l7vs_sched_put(sched);
         l7vs_protomod_put(pmod);
-        l7vs_lsock_put(lsock);
+        if(pid==0) l7vs_lsock_put(lsock);
         *err = L7VS_CONFIG_ERR_NOMEM;
         LOGGER_PUT_LOG_ERROR( LOG_CAT_L7VSD_SYSTEM_MEMORY,5, "l7vs_service memory allocate error" );
         return NULL;
@@ -736,7 +740,7 @@ make_l7vs_service_data( l7vs_service_arg_multi *arg,  int *err)
         l7vs_dest_destroy(sorry_dest);
         l7vs_sched_put(sched);
         l7vs_protomod_put(pmod);
-        l7vs_lsock_put(lsock);
+        if(pid==0) l7vs_lsock_put(lsock);
         *err = L7VS_CONFIG_ERR_NOMEM;
         //debug output
         if( LOG_LV_DEBUG == logger_get_log_level( LOG_CAT_L7VSD_VIRTUAL_SERVICE ) ){
@@ -974,7 +978,7 @@ l7vs_notify_proto_of_child(gpointer pid,struct l7vs_service_arg_multi *arg)
 /*!
  * check child process when create service. and send information for adding service.
  * @param[in] *arg   l7vs_service_arg_multi
- * @return 0: nothing IP+port, 1: exist IP+port
+ * @return 0: nothing IP+port, 1: exist IP+port, -1: error
  */
 int
 l7vs_child_process_check(struct l7vs_service_arg_multi *arg)
@@ -1000,12 +1004,14 @@ l7vs_child_process_check(struct l7vs_service_arg_multi *arg)
             if(ret){
                 /* あったのでサービス重複エラー */
                 LOGGER_PUT_LOG_ERROR( LOG_CAT_L7VSD_VIRTUAL_SERVICE,2, "Virtual service already exists" );
+                srv_sock_check_flg = -1;
             }else{
                 /* 親持ちのリストl7vs_child_proto_grpにプロトコル追加 */
                 l7vs_child_proto_add_proto(cpgrp,arg->srv_arg.protomod);
 
                 /* 既存子プロセス持ちのリストにprotocol追加通知 */
                 g_slist_foreach(cpgrp->child_pid,(GFunc)l7vs_notify_proto_of_child,arg);
+
             }
         }
 
@@ -1018,7 +1024,7 @@ l7vs_child_process_check(struct l7vs_service_arg_multi *arg)
  * @return      OK=0, NG=-1
  */
 int
-l7vs_receive_add_protocol_info(int fd)
+l7vs_receive_add_protocol_info(int fd, pid_t pid)
 {
     l7vs_service_arg_multi *arg;
     void *buffer;
@@ -1026,6 +1032,8 @@ l7vs_receive_add_protocol_info(int fd)
 
     int err;
 
+    /* 子プロセスでl7vs_service_arg_multiを作る関数 */
+
     // buffer確保
     buffer = malloc(sizeof(struct l7vs_service_arg_multi));
     if(buffer == NULL){
@@ -1042,7 +1050,7 @@ l7vs_receive_add_protocol_info(int fd)
     arg = (l7vs_service_arg_multi *)buffer;
 
     // l7vs_service作成
-    srv = make_l7vs_service_data(arg,&err);
+    srv = make_l7vs_service_data(arg,&err,pid);
     if(srv == NULL){
         free(buffer);
         return -1;
@@ -1060,7 +1068,7 @@ l7vs_receive_add_protocol_info(int fd)
  * @return              int             OK=0, NG<0
  */     
 static int
-l7vs_cfifo_callback(struct l7vs_iomux *iom )
+l7vs_cfifo_callback(struct l7vs_iomux *iom)
 {
     int ret;
 
@@ -1089,8 +1097,8 @@ l7vs_cfifo_callback(struct l7vs_iomux *iom )
                 "in_fuction:  int l7vs_cfifo_callback (struct l7vs_iomux *iom) iom = %p",iom);
         }
 
-
-        ret = l7vs_receive_add_protocol_info(iom->fd);
+        /* 必ず子で起動するはずなので、pidは0固定 */
+        ret = l7vs_receive_add_protocol_info(iom->fd,0);
         if(ret==-1){
             return -1;
         }
@@ -1323,6 +1331,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                 /* 子プロセスを生成したら親プロセスでIP,portとPIDの対応リストを作る */
 
                 /* 親プロセスから引き継いだUNIXドメインソケットを閉じる */
+                /* 現在、閉じると親プロセスが死ぬ */
                 //l7vs_config_close();
 
                 /* 親プロセス用PIPEを閉じる */
@@ -1332,7 +1341,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                 if( pid == 0 ){
                     /* ソケット作成 */
                     /* 以前はmake_l7vs_service_dataがまるごと入っていた */
-                    srv = make_l7vs_service_data(arg,err);
+                    srv = make_l7vs_service_data(arg,err,pid);
                     if( srv == NULL) return NULL;
 
                     /* 名前付きパイプ作成 */
@@ -1404,7 +1413,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                     l7vs_cfifo_iomux->data = NULL;
                     l7vs_cfifo_iomux->callback = l7vs_cfifo_callback;
                     l7vs_cfifo_iomux->status = iomux_cfifo_read_waiting;
-                    l7vs_iomux_add( l7vs_cfifo_iomux, iom_read );
+                    l7vs_iomux_add( l7vs_cfifo_iomux, iom_read);
 
                     /* 親PIPEを開いてPIDとIP,portを親に通知 */
                     /* リトライするかどうか・・・sleepいれる? */
@@ -1445,12 +1454,17 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
 
                 }else if( pid > 0 ){
                     /* 親プロセス処理 */
+                    // 子プロセス作成ループに入れると、子プロセス個数分親処理が走ってしまう
+
+                    /* VS情報作成 */
+                    srv = make_l7vs_service_data(arg,err,pid);
+                    if( srv == NULL) return NULL;
 
                     /* l7vs_child_proto_grpを初期化作成してリスト登録←複数回を考慮 */
                     grp = l7vs_child_proto_grp_init(arg->srv_arg.addr.sin_addr.s_addr,
                                                     arg->srv_arg.addr.sin_port,
                                                     arg->srv_arg.protomod );
-
+                    return srv;
                 }else if( pid < 0 ){
                     /* 子プロセス作成失敗 */
 		    //DEBUG output
@@ -1461,6 +1475,17 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                     return NULL;
                 }
             }
+        }else if(srv_sock_check_flg == 1){
+            /* 子プロセス追加なし、VSのみ追加 */
+            /* 子プロセスは追加しないけど、親側VS情報は追加 */
+            // pidは0以外ならOK
+            srv = make_l7vs_service_data(arg,err,1);
+            if( srv == NULL) return NULL;
+
+            return srv;
+        }else{
+            /* VS重複エラー */
+            return NULL;
         }
 }