casa-mp-base

--- macof.c.orig    2009-09-09 00:01:27.000000000 +0200

+++ macof.c 2009-09-09 00:01:37.000000000 +0200

@@ -48,8 +48,8 @@

 static void

 gen_mac(u_char *mac)

 {

-   *((in_addr_t *)mac) = libnet_get_prand(PRu32);

-   *((u_short *)(mac + 4)) = libnet_get_prand(PRu16);

+   *((in_addr_t *)mac) = libnet_get_prand(LIBNET_PRu32);

+   *((u_short *)(mac + 4)) = libnet_get_prand(LIBNET_PRu16);

 }

 int

@@ -59,22 +59,23 @@

    extern int optind;

    int c, i;

    struct libnet_link_int *llif;

-   char ebuf[PCAP_ERRBUF_SIZE];

+   char pcap_ebuf[PCAP_ERRBUF_SIZE];

+   char libnet_ebuf[LIBNET_ERRBUF_SIZE];

    u_char sha[ETHER_ADDR_LEN], tha[ETHER_ADDR_LEN];

    in_addr_t src, dst;

    u_short sport, dport;

    u_int32_t seq;

-   u_char pkt[ETH_H + IP_H + TCP_H];

+   libnet_t *l;

    while ((c = getopt(argc, argv, "vs:d:e:x:y:i:n:h?V")) != -1) {

        switch (c) {

        case 'v':

            break;

        case 's':

-           Src = libnet_name_resolve(optarg, 0);

+           Src = libnet_name2addr4(l, optarg, 0);

            break;

        case 'd':

-           Dst = libnet_name_resolve(optarg, 0);

+           Dst = libnet_name2addr4(l, optarg, 0);

            break;

        case 'e':

            Tha = (u_char *)ether_aton(optarg);

@@ -101,13 +102,13 @@

    if (argc != 0)

        usage();

-   if (!Intf && (Intf = pcap_lookupdev(ebuf)) == NULL)

-       errx(1, "%s", ebuf);

+   if (!Intf && (Intf = pcap_lookupdev(pcap_ebuf)) == NULL)

+       errx(1, "%s", pcap_ebuf);

-   if ((llif = libnet_open_link_interface(Intf, ebuf)) == 0)

-       errx(1, "%s", ebuf);

+   if ((l = libnet_init(LIBNET_LINK, Intf, libnet_ebuf)) == NULL)

+       errx(1, "%s", libnet_ebuf);

-   libnet_seed_prand();

+   libnet_seed_prand(l);

    for (i = 0; i != Repeat; i++) {

@@ -117,39 +118,39 @@

        else memcpy(tha, Tha, sizeof(tha));

        if (Src != 0) src = Src;

-       else src = libnet_get_prand(PRu32);

+       else src = libnet_get_prand(LIBNET_PRu32);

        if (Dst != 0) dst = Dst;

-       else dst = libnet_get_prand(PRu32);

+       else dst = libnet_get_prand(LIBNET_PRu32);

        if (Sport != 0) sport = Sport;

-       else sport = libnet_get_prand(PRu16);

+       else sport = libnet_get_prand(LIBNET_PRu16);

        if (Dport != 0) dport = Dport;

-       else dport = libnet_get_prand(PRu16);

+       else dport = libnet_get_prand(LIBNET_PRu16);

-       seq = libnet_get_prand(PRu32);

-       

-       libnet_build_ethernet(tha, sha, ETHERTYPE_IP, NULL, 0, pkt);

-       

-       libnet_build_ip(TCP_H, 0, libnet_get_prand(PRu16), 0, 64,

-               IPPROTO_TCP, src, dst, NULL, 0, pkt + ETH_H);

+       seq = libnet_get_prand(LIBNET_PRu32);

        libnet_build_tcp(sport, dport, seq, 0, TH_SYN, 512,

-                0, NULL, 0, pkt + ETH_H + IP_H);

+                0, 0, LIBNET_TCP_H, NULL, 0, l, 0);