[hipl-commit] [trunk] Rev 4306: Remove disabled code from the agent subdirectory.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 16 Apr 2010 01:58:59 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 16/04/2010 at 01:58:59
Revision: 4306
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Remove disabled code from the agent subdirectory.

Modified:
  M  agent/connhipd.c
  M  agent/tools.c

=== modified file 'agent/connhipd.c'
--- agent/connhipd.c    2010-04-15 20:47:19 +0000
+++ agent/connhipd.c    2010-04-15 22:58:45 +0000
@@ -116,7 +116,7 @@
 static int connhipd_handle_msg(struct hip_common *msg,
                                struct sockaddr_un *addr)
 {
-    struct hip_tlv_common *param = NULL;    //, *param2 = NULL;
+    struct hip_tlv_common *param = NULL;
     struct hip_common *emsg;
     hip_hdr_type_t type;
     HIT_Remote hit;
@@ -200,13 +200,6 @@
             } else if (ret == 0)                   {
                 connhipd_send_hitdata_to_daemon(msg, &hitr, &hit.g->l->lhit);
             }
-            /* Reset local HIT, if outgoing I1. */
-            /*
-             * HIP_HEXDUMP("Old local HIT: ", &msg->hits, 16);
-             * HIP_HEXDUMP("New local HIT: ", &hit.g->l->lhit, 16);
-             * HIP_HEXDUMP("Old remote HIT: ", &msg->hitr, 16);
-             * HIP_HEXDUMP("New remote HIT: ", &hit.hit, 16);
-             */
         }
         /* If neither HIT in message was local HIT, then drop the packet! */
         else {
@@ -280,7 +273,6 @@
             /* Test connection. */
             hip_build_user_hdr(msg, HIP_MSG_AGENT_PING, 0);
             n = hip_send_recv_daemon_info(msg, 1, hip_agent_sock);
-            //if (n < 0) HIP_DEBUG("Could not send ping to daemon, 
waiting.\n");
             hip_agent_connected--;
         }
 

=== modified file 'agent/tools.c'
--- agent/tools.c       2010-04-12 15:38:02 +0000
+++ agent/tools.c       2010-04-15 22:58:45 +0000
@@ -158,16 +158,7 @@
         if (err != 3) {
             goto loop_end;
         }
-#if 0
-        p1 = strtok(buf, "+=");
-        if (p1 == NULL) {
-            goto loop_end;
-        }
-        p2 = strtok(NULL, "\0");
-        if (p2 == NULL) {
-            goto loop_end;
-        }
-#endif
+
         /* Set values. */
         p3 = strdup(str_var_get(p1));
         if (add == '+' && strlen(p3) > 0) {

Other related posts:

  • » [hipl-commit] [trunk] Rev 4306: Remove disabled code from the agent subdirectory. - Diego Biurrun