History

Merge branch 'master' of ../nf-2.6

Patrick McHardy committed 16 years ago

Commit e8a96f62 parents c01ae81 1da05f54 files · +13 −22Browse files

Unified · Split

4 files
  1. include/linux/netfilter/nf_conntrack_tuple_common.h +1 −2
  2. include/linux/netfilter_ipv6/ip6_tables.h +0 −4
  3. net/bridge/netfilter/ebt_ip6.c +4 −14
  4. net/netfilter/ipvs/ip_vs_ftp.c +8 −2
include/linux/netfilter/nf_conntrack_tuple_common.h+1−2
@@ -1,8 +1,7 @@
11 #ifndef _NF_CONNTRACK_TUPLE_COMMON_H
22 #define _NF_CONNTRACK_TUPLE_COMMON_H
33
4−enum ip_conntrack_dir
5−{
4+enum ip_conntrack_dir {
65 IP_CT_DIR_ORIGINAL,
76 IP_CT_DIR_REPLY,
87 IP_CT_DIR_MAX
include/linux/netfilter_ipv6/ip6_tables.h+0−4
@@ -316,10 +316,6 @@ extern int ip6t_ext_hdr(u8 nexthdr); · 315 unmodified lines
316316 extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
317317 int target, unsigned short *fragoff);
318318
319−extern int ip6_masked_addrcmp(const struct in6_addr *addr1,
320− const struct in6_addr *mask,
321− const struct in6_addr *addr2);
322−
323319 #define IP6T_ALIGN(s) XT_ALIGN(s)
324320
325321 #ifdef CONFIG_COMPAT
net/bridge/netfilter/ebt_ip6.c+4−14
@@ -35,8 +35,6 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) · 34 unmodified lines
3535 struct ipv6hdr _ip6h;
3636 const struct tcpudphdr *pptr;
3737 struct tcpudphdr _ports;
38− struct in6_addr tmp_addr;
39− int i;
4038
4139 ih6 = skb_header_pointer(skb, 0, sizeof(_ip6h), &_ip6h);
4240 if (ih6 == NULL)
@@ -44,18 +42,10 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct xt_match_param *par) · 1 unmodified line
4442 if (info->bitmask & EBT_IP6_TCLASS &&
4543 FWINV(info->tclass != ipv6_get_dsfield(ih6), EBT_IP6_TCLASS))
4644 return false;
47− for (i = 0; i < 4; i++)
48− tmp_addr.in6_u.u6_addr32[i] = ih6->saddr.in6_u.u6_addr32[i] &
49− info->smsk.in6_u.u6_addr32[i];
50− if (info->bitmask & EBT_IP6_SOURCE &&
51− FWINV((ipv6_addr_cmp(&tmp_addr, &info->saddr) != 0),
52− EBT_IP6_SOURCE))
53− return false;
54− for (i = 0; i < 4; i++)
55− tmp_addr.in6_u.u6_addr32[i] = ih6->daddr.in6_u.u6_addr32[i] &
56− info->dmsk.in6_u.u6_addr32[i];
57− if (info->bitmask & EBT_IP6_DEST &&
58− FWINV((ipv6_addr_cmp(&tmp_addr, &info->daddr) != 0), EBT_IP6_DEST))
45+ if (FWINV(ipv6_masked_addr_cmp(&ih6->saddr, &info->smsk,
46+ &info->saddr), EBT_IP6_SOURCE) ||
47+ FWINV(ipv6_masked_addr_cmp(&ih6->daddr, &info->dmsk,
48+ &info->daddr), EBT_IP6_DEST))
5949 return false;
6050 if (info->bitmask & EBT_IP6_PROTO) {
6151 uint8_t nexthdr = ih6->nexthdr;
net/netfilter/ipvs/ip_vs_ftp.c+8−2
@@ -208,8 +208,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp, · 207 unmodified lines
208208 */
209209 from.ip = n_cp->vaddr.ip;
210210 port = n_cp->vport;
211− sprintf(buf, "%u,%u,%u,%u,%u,%u", NIPQUAD(from.ip),
212− (ntohs(port)>>8)&255, ntohs(port)&255);
211+ snprintf(buf, sizeof(buf), "%u,%u,%u,%u,%u,%u",
212+ ((unsigned char *)&from.ip)[0],
213+ ((unsigned char *)&from.ip)[1],
214+ ((unsigned char *)&from.ip)[2],
215+ ((unsigned char *)&from.ip)[3],
216+ ntohs(port) >> 8,
217+ ntohs(port) & 0xFF);
218+
213219 buf_len = strlen(buf);
214220
215221 /*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t