Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327791
b: refs/heads/master
c: 6703aa7
h: refs/heads/master
i:
  327789: 29887a8
  327787: 6421fde
  327783: 199afc4
  327775: d0f1f8b
v: v3
  • Loading branch information
Pablo Neira Ayuso committed Sep 3, 2012
1 parent 16fa197 commit c52d34b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a91bb0c304b0853f8c59b1b48c7822c52362cba
refs/heads/master: 6703aa74ad1ba2e598bb49a37f7518da1195bacb
12 changes: 6 additions & 6 deletions trunk/net/netfilter/xt_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@ socket_match(const struct sk_buff *skb, struct xt_action_param *par,
const struct iphdr *iph = ip_hdr(skb);
struct udphdr _hdr, *hp = NULL;
struct sock *sk;
__be32 daddr, saddr;
__be16 dport, sport;
u8 protocol;
__be32 uninitialized_var(daddr), uninitialized_var(saddr);
__be16 uninitialized_var(dport), uninitialized_var(sport);
u8 uninitialized_var(protocol);
#ifdef XT_SOCKET_HAVE_CONNTRACK
struct nf_conn const *ct;
enum ip_conntrack_info ctinfo;
Expand Down Expand Up @@ -261,9 +261,9 @@ socket_mt6_v1(const struct sk_buff *skb, struct xt_action_param *par)
struct ipv6hdr *iph = ipv6_hdr(skb);
struct udphdr _hdr, *hp = NULL;
struct sock *sk;
struct in6_addr *daddr, *saddr;
__be16 dport, sport;
int thoff = 0, tproto;
struct in6_addr *daddr = NULL, *saddr = NULL;
__be16 uninitialized_var(dport), uninitialized_var(sport);
int thoff = 0, uninitialized_var(tproto);
const struct xt_socket_mtinfo1 *info = (struct xt_socket_mtinfo1 *) par->matchinfo;

tproto = ipv6_find_hdr(skb, &thoff, -1, NULL, NULL);
Expand Down

0 comments on commit c52d34b

Please sign in to comment.