updated plugins to 0.8.0

Author: tux-mind

Android.mk

@@ -5,7 +5,8 @@ ettercap_pl_includes := \
 	external/libpcre\
 	external/libpcap\
 	external/libnet/libnet/include\
-	external/libbthread
+	external/libbthread\
+	external/libcurl/include
 
 
 include $(call all-subdir-makefiles)

plug-ins/arp_cop/arp_cop.c

@@ -19,7 +19,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-    $Id: arp_cop.c,v 1.4 2004/05/13 09:54:55 alor Exp $
 */
 
 
@@ -43,17 +42,17 @@ LIST_HEAD(, hosts_list) arp_cop_table;
 
 struct plugin_ops arp_cop_ops = { 
    /* ettercap version MUST be the global EC_VERSION */
-   ettercap_version: EC_VERSION,                        
+   .ettercap_version =  EC_VERSION,                        
    /* the name of the plugin */
-   name:             "arp_cop",  
+   .name =              "arp_cop",  
     /* a short description of the plugin (max 50 chars) */                    
-   info:             "Report suspicious ARP activity",  
+   .info =              "Report suspicious ARP activity",  
    /* the plugin version. */ 
-   version:          "1.1",   
+   .version =           "1.1",   
    /* activation function */
-   init:             &arp_cop_init,
+   .init =              &arp_cop_init,
    /* deactivation function */                     
-   fini:             &arp_cop_fini,
+   .fini =              &arp_cop_fini,
 };
 
 /**********************************************************/

plug-ins/autoadd/autoadd.c

@@ -17,7 +17,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-    $Id: autoadd.c,v 1.6 2004/10/25 20:35:15 alor Exp $
 */
 
 
@@ -39,17 +38,17 @@ static int add_to_victims(void *group, struct packet_object *po);
 
 struct plugin_ops autoadd_ops = { 
    /* ettercap version MUST be the global EC_VERSION */
-   ettercap_version: EC_VERSION,                        
+   .ettercap_version =  EC_VERSION,                        
    /* the name of the plugin */
-   name:             "autoadd",  
+   .name =              "autoadd",  
     /* a short description of the plugin (max 50 chars) */                    
-   info:             "Automatically add new victims in the target range",  
+   .info =              "Automatically add new victims in the target range",  
    /* the plugin version. */ 
-   version:          "1.2",   
+   .version =           "1.2",   
    /* activation function */
-   init:             &autoadd_init,
+   .init =              &autoadd_init,
    /* deactivation function */                     
-   fini:             &autoadd_fini,
+   .fini =              &autoadd_fini,
 };
 
 /**********************************************************/

plug-ins/chk_poison/chk_poison.c

@@ -20,7 +20,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-    $Id: chk_poison.c,v 1.4 2004/07/28 08:06:31 alor Exp $
 */
 
 
@@ -32,6 +31,7 @@
 #include <ec_mitm.h>
 
 #include <pthread.h>
+#include <time.h>
 
 struct poison_list {
    struct ip_addr ip[2];
@@ -57,17 +57,17 @@ static void parse_icmp(struct packet_object *po);
 
 struct plugin_ops chk_poison_ops = { 
    /* ettercap version MUST be the global EC_VERSION */
-   ettercap_version: EC_VERSION,                        
+   .ettercap_version =  EC_VERSION,                        
    /* the name of the plugin */
-   name:             "chk_poison",  
+   .name =              "chk_poison",  
     /* a short description of the plugin (max 50 chars) */                    
-   info:             "Check if the poisoning had success",  
+   .info =              "Check if the poisoning had success",  
    /* the plugin version. */ 
-   version:          "1.1",   
+   .version =           "1.1",   
    /* activation function */
-   init:             &chk_poison_init,
+   .init =              &chk_poison_init,
    /* deactivation function */                     
-   fini:             &chk_poison_fini,
+   .fini =              &chk_poison_fini,
 };
 
 /**********************************************************/
@@ -89,6 +89,12 @@ static int chk_poison_init(void *dummy)
    struct poison_list *p;
    char poison_any, poison_full;
    u_char i;
+
+#if !defined(OS_WINDOWS)
+   struct timespec tm;
+   tm.tv_sec = GBL_CONF->arp_storm_delay;
+   tm.tv_nsec = 0;
+#endif
 
    /* don't show packets while operating */
    GBL_OPTIONS->quiet = 1;
@@ -123,8 +129,12 @@ static int chk_poison_init(void *dummy)
    /* Send spoofed ICMP echo request to each victim */
    SLIST_FOREACH(p, &poison_table, next) {
       for (i = 0; i <= 1; i++) {
-         send_L3_icmp_echo(ICMP_ECHO, &(p->ip[i]), &(p->ip[!i]));   
-         usleep(GBL_CONF->arp_storm_delay * 1000);
+         send_L3_icmp_echo(&(p->ip[i]), &(p->ip[!i]));   
+#if !defined(OS_WINDOWS)
+         nanosleep(&tm, NULL);
+#else
+         usleep(GBL_CONF->arp_storm_delay);
+#endif
       }
    }
 
@@ -151,7 +161,7 @@ static int chk_poison_init(void *dummy)
    if (!poison_any) 
       INSTANT_USER_MSG("chk_poison: No poisoning at all :(\n");   
    else if (poison_full) 
-      INSTANT_USER_MSG("chk_poison: Poisoning process succesful!\n");
+      INSTANT_USER_MSG("chk_poison: Poisoning process successful!\n");
    else 
       SLIST_FOREACH(p, &poison_table, next) {
          for (i=0; i<=1; i++)