[BACK]Return to conntrack.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / dnsmasq / src

Diff for /embedaddon/dnsmasq/src/conntrack.c between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2016/11/02 09:57:01 version 1.1.1.4, 2021/03/17 00:56:46
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2016 Simon Kelley/* dnsmasq is Copyright (c) 2000-2021 Simon Kelley
   
    This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
Line 24  static int gotit = 0; /* yuck */ Line 24  static int gotit = 0; /* yuck */
   
 static int callback(enum nf_conntrack_msg_type type, struct nf_conntrack *ct, void *data);  static int callback(enum nf_conntrack_msg_type type, struct nf_conntrack *ct, void *data);
   
int get_incoming_mark(union mysockaddr *peer_addr, struct all_addr *local_addr, int istcp, unsigned int *markp)int get_incoming_mark(union mysockaddr *peer_addr, union all_addr *local_addr, int istcp, unsigned int *markp)
 {  {
   struct nf_conntrack *ct;    struct nf_conntrack *ct;
   struct nfct_handle *h;    struct nfct_handle *h;
Line 36  int get_incoming_mark(union mysockaddr *peer_addr, str Line 36  int get_incoming_mark(union mysockaddr *peer_addr, str
       nfct_set_attr_u8(ct, ATTR_L4PROTO, istcp ? IPPROTO_TCP : IPPROTO_UDP);        nfct_set_attr_u8(ct, ATTR_L4PROTO, istcp ? IPPROTO_TCP : IPPROTO_UDP);
       nfct_set_attr_u16(ct, ATTR_PORT_DST, htons(daemon->port));        nfct_set_attr_u16(ct, ATTR_PORT_DST, htons(daemon->port));
               
 #ifdef HAVE_IPV6  
       if (peer_addr->sa.sa_family == AF_INET6)        if (peer_addr->sa.sa_family == AF_INET6)
         {          {
           nfct_set_attr_u8(ct, ATTR_L3PROTO, AF_INET6);            nfct_set_attr_u8(ct, ATTR_L3PROTO, AF_INET6);
           nfct_set_attr(ct, ATTR_IPV6_SRC, peer_addr->in6.sin6_addr.s6_addr);            nfct_set_attr(ct, ATTR_IPV6_SRC, peer_addr->in6.sin6_addr.s6_addr);
           nfct_set_attr_u16(ct, ATTR_PORT_SRC, peer_addr->in6.sin6_port);            nfct_set_attr_u16(ct, ATTR_PORT_SRC, peer_addr->in6.sin6_port);
          nfct_set_attr(ct, ATTR_IPV6_DST, local_addr->addr.addr6.s6_addr);          nfct_set_attr(ct, ATTR_IPV6_DST, local_addr->addr6.s6_addr);
         }          }
       else        else
 #endif  
         {          {
           nfct_set_attr_u8(ct, ATTR_L3PROTO, AF_INET);            nfct_set_attr_u8(ct, ATTR_L3PROTO, AF_INET);
           nfct_set_attr_u32(ct, ATTR_IPV4_SRC, peer_addr->in.sin_addr.s_addr);            nfct_set_attr_u32(ct, ATTR_IPV4_SRC, peer_addr->in.sin_addr.s_addr);
           nfct_set_attr_u16(ct, ATTR_PORT_SRC, peer_addr->in.sin_port);            nfct_set_attr_u16(ct, ATTR_PORT_SRC, peer_addr->in.sin_port);
          nfct_set_attr_u32(ct, ATTR_IPV4_DST, local_addr->addr.addr4.s_addr);          nfct_set_attr_u32(ct, ATTR_IPV4_DST, local_addr->addr4.s_addr);
         }          }
               
               
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>