コミット: ff7dbac45c2341fade032200cc5e5cdc5971b9ba - UltraMonkeyL7_v4_nakano (git)

コミットメタ情報

• リビジョン: ff7dbac45c2341fade032200cc5e5cdc5971b9ba (tree)
• 日時: 2014-07-11 17:19:45
• 作者: Hiroaki Nakano <nakano.hiroaki@nttc...>
• コミッター: Hiroaki Nakano

ログメッセージ

edit途中。

- l7vs_service_argにある使わないchild_pid配列のせいでl7vsadmが失敗していたので削除
- 親プロセスと子プロセスの間でやり取りするipとportがネットバイトオーダーだったので、通常のものに変換。それに伴うIF変更対応。

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

変更サマリ

• modified: include/l7vs_service.h
• modified: src/service.c

差分

--- a/include/l7vs_service.h
+++ b/include/l7vs_service.h
@@ -89,8 +89,6 @@ struct l7vs_service_arg{
     int                persist; //! persistency
     int                backlog; //! listen(2) backlog length
 
-    pid_t              child_pid[MAX_CHILD]; //! child process pid list
-
     char               protomod[L7VS_MODNAME_LEN]; //! protocol module name
     char               schedmod[L7VS_MODNAME_LEN]; //! scheduler
 

--- a/src/service.c
+++ b/src/service.c
@@ -841,7 +841,7 @@ l7vs_child_proto_grp_init(uint32_t ip, uint16_t port, char *proto)
  * @return      l7vs_child_proto_grp pointer
  */
 struct l7vs_child_proto_grp *
-l7vs_child_proto_grp_search(uint32_t ip, uint16_t port)
+l7vs_child_proto_grp_search(struct in_addr ip, uint16_t port)
 {
     GList *l;
     struct l7vs_child_proto_grp *grp;
@@ -849,7 +849,7 @@ l7vs_child_proto_grp_search(uint32_t ip, uint16_t port)
     grp = NULL;
     for(l = g_list_first(l7vs_child_list); l != NULL; l = g_list_next(l)) {
         grp = (struct l7vs_child_proto_grp *)l->data;
-        if((grp->addr.sin_addr.s_addr != ip) || (grp->addr.sin_port != port)) {
+        if((grp->addr.sin_addr.s_addr != ip.s_addr) || (grp->addr.sin_port != port)) {
             continue;
         }else{
             return grp;
@@ -983,7 +983,7 @@ l7vs_child_process_check(struct l7vs_service_arg_multi *arg)
         struct l7vs_child_proto_grp *cpgrp;
 
         /* IP, port重複チェック */
-        cpgrp = l7vs_child_proto_grp_search(arg->srv_arg.addr.sin_addr.s_addr,arg->srv_arg.addr.sin_port);
+        cpgrp = l7vs_child_proto_grp_search(arg->srv_arg.addr.sin_addr, arg->srv_arg.addr.sin_port);
         if(cpgrp == NULL){
             /* 無かったので子プロ作る */
             srv_sock_check_flg = 0;
@@ -1121,7 +1121,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
         int srv_mod_check_flg = 0;
 	int ret = 0;
         int i, readid, writeid, writefifo, readfifo, dummyfifo;
-        uint32_t ip;
+        char *ip;
         uint16_t port;
         pid_t pid;
         GList *l;
@@ -1182,11 +1182,11 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                     if( srv == NULL) return NULL;
 
                     /* 名前付きパイプ作成 */
-                    ip = arg->srv_arg.addr.sin_addr.s_addr;
-                    port = arg->srv_arg.addr.sin_port;
+                    ip = inet_ntoa(arg->srv_arg.addr.sin_addr);
+                    port = ntohs(arg->srv_arg.addr.sin_port);
                     pid = getpid();
 
-                    snprintf(fifopath, sizeof(fifopath), "/tmp/l7vsd_%ud_%ud", ip, port);
+                    snprintf(fifopath, sizeof(fifopath), "/tmp/l7vsd_%s_%d", ip, port);
 		    ret = stat(fifopath, &st);
 		    if(!ret){
 		      if(!(S_ISDIR(st.st_mode))){
@@ -1210,7 +1210,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
 		      }
 		    }
 
-                    snprintf(fifoname, sizeof(fifoname), "/tmp/l7vsd_%ud_%ud/l7vsd.%ud", ip, port, pid);
+                    snprintf(fifoname, sizeof(fifoname), "/tmp/l7vsd_%s_%d/l7vsd.%d", ip, port, pid);
                     ret = mkfifo(fifoname, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
                     if(ret == -1){
                         perror("mkfifo");
@@ -1233,7 +1233,7 @@ l7vs_service_create(struct l7vs_service_arg_multi *arg, int *err)
                     l7vs_iomux_add( l7vs_cfifo_iomux, iom_read );
 
                     /* 親PIPEを開いてPIDとIP,portを親に通知 */
-                    snprintf(childinfo, sizeof(childinfo), "%ud %ud %ud", ip, port, pid);
+                    snprintf(childinfo, sizeof(childinfo), "%s %d %d", ip, port, pid);
                     if((writefifo = open(P_FIFO, O_WRONLY, 0)) < 0) {
                         perror("open");
                         /* 各種アンロード */
@@ -1285,10 +1285,12 @@ int
 l7vs_receive_child_process_info(int fd)
 {
     // すぐ上のforkの親プロセス処理でやるか、epollイベントでやるか検討
-    uint32_t ip;
-    uint16_t port;
+    char ip[17];
+    struct in_addr nip;
+    uint16_t port, nport;
     pid_t pid;
     struct l7vs_child_proto_grp *grp;
+    int ret;
 
     // 読み込み
     if((read(fd, childinfo, sizeof(childinfo)))==-1) {
@@ -1297,9 +1299,15 @@ l7vs_receive_child_process_info(int fd)
     }
 
     // ip, port, pidを切り出す
-    sscanf(childinfo, "%ud %ud %ud", ip, port, pid);
+    sscanf(childinfo, "%s %d %d", ip, port, pid);
+    // 取り出した情報をネットワークバイトオーダーに変換する
+    if(!(inet_aton(ip, &nip))){
+      return -1;
+    }
+    nport = htons(port);
+
     // ipとportからl7vs_child_proto_grpを検索
-    grp = l7vs_child_proto_grp_search(ip, port);
+    grp = l7vs_child_proto_grp_search(nip, nport);
     if(grp == NULL) {
         return -1;
     }