Browse code

ファイル削除処理でオブジェクトが残ってしまう不具合を修正

Masanobu Yasui authored on 2014/12/11 16:27:38
Showing 2 changed files
... ...
@@ -298,7 +298,6 @@ static void mrecv_ack_del(mdata *data, struct sockaddr_in *addr)
298 298
   if(mrecv_ack_search(&t, &m, data, addr)){
299 299
     return;
300 300
   }
301
-  lprintf(0, "%s: rid=%d ip=%s sendstate=%d recvstate=%d\n", __func__, m->mdata.head.reqid, inet_ntoa(m->addr.sin_addr), m->mdata.head.nstate, data->head.nstate);
302 301
   if(m->mdata.head.nstate == MAKUO_SENDSTATE_CLOSE){
303 302
     if(data->head.nstate != MAKUO_RECVSTATE_CLOSE){
304 303
       return;
... ...
@@ -1329,9 +1328,6 @@ static void mrecv_req_del_data(mdata *data, struct sockaddr_in *addr)
1329 1329
 static void mrecv_req_del_close(mdata *data, struct sockaddr_in *addr)
1330 1330
 {
1331 1331
   mfile *m = mrecv_req_search(data, addr);
1332
-  if(m){
1333
-    lprintf(0, "%s: rid=%d ip=%s\n", __func__, m->mdata.head.reqid, inet_ntoa(m->addr.sin_addr));
1334
-  }
1335 1332
   msend(mkack(data, addr, MAKUO_RECVSTATE_CLOSE));
1336 1333
   mrecv_mfdel(m);
1337 1334
 }
... ...
@@ -1156,9 +1156,7 @@ static void msend_req_del_data(int s, mfile *m)
1156 1156
 
1157 1157
 static void msend_req_del_close(int s, mfile *m)
1158 1158
 {
1159
-  lprintf(0, "%s: 0 rid=%d\n", __func__, m->mdata.head.reqid);
1160 1159
   if(m->initstate){
1161
-    lprintf(0, "%s: 1 rid=%d\n", __func__, m->mdata.head.reqid);
1162 1160
     m->initstate = 0;
1163 1161
     m->sendwait  = 1;
1164 1162
     ack_clear(m, -1);
... ...
@@ -1166,17 +1164,14 @@ static void msend_req_del_close(int s, mfile *m)
1166 1166
     return;
1167 1167
   }
1168 1168
   if(m->sendwait){
1169
-    lprintf(0, "%s: 2 rid=%d\n", __func__, m->mdata.head.reqid);
1170 1169
     msend_packet(s, &(m->mdata), &(m->addr));
1171 1170
     return;
1172 1171
   }
1173 1172
   if(m->link){
1174
-    lprintf(0, "%s: 3 rid=%d\n", __func__, m->mdata.head.reqid);
1175 1173
     m->link->sendwait = 0;
1176 1174
   }
1177 1175
   m->link = NULL;
1178 1176
   msend_mfdel(m);
1179
-  lprintf(0, "%s: 4 rid=%d\n", __func__, m->mdata.head.reqid);
1180 1177
 }
1181 1178
 
1182 1179
 /*----- del -----*/