Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
de1354d6
Commit
de1354d6
authored
Mar 25, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents
b4f6270e
e913173f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
148 deletions
+33
-148
include/linux/skbuff.h
include/linux/skbuff.h
+8
-7
include/net/ah.h
include/net/ah.h
+1
-4
include/net/esp.h
include/net/esp.h
+0
-2
include/net/xfrm.h
include/net/xfrm.h
+3
-0
net/core/skbuff.c
net/core/skbuff.c
+19
-54
net/netsyms.c
net/netsyms.c
+1
-4
net/xfrm/xfrm_algo.c
net/xfrm/xfrm_algo.c
+1
-77
No files found.
include/linux/skbuff.h
View file @
de1354d6
...
...
@@ -231,15 +231,8 @@ struct sk_buff {
pkt_type
,
ip_summed
;
__u32
priority
;
atomic_t
users
;
unsigned
short
protocol
,
security
;
unsigned
int
truesize
;
unsigned
char
*
head
,
*
data
,
*
tail
,
*
end
;
void
(
*
destructor
)(
struct
sk_buff
*
skb
);
#ifdef CONFIG_NETFILTER
...
...
@@ -261,6 +254,14 @@ struct sk_buff {
#ifdef CONFIG_NET_SCHED
__u32
tc_index
;
/* traffic control index */
#endif
/* These elements must be at the end, see alloc_skb() for details. */
unsigned
int
truesize
;
atomic_t
users
;
unsigned
char
*
head
,
*
data
,
*
tail
,
*
end
;
};
#define SK_WMEM_MAX 65535
...
...
include/net/ah.h
View file @
de1354d6
...
...
@@ -17,9 +17,6 @@ struct ah_data
struct
crypto_tfm
*
tfm
;
};
extern
void
skb_ah_walk
(
const
struct
sk_buff
*
skb
,
struct
crypto_tfm
*
tfm
,
icv_update_fn_t
icv_update
);
static
inline
void
ah_hmac_digest
(
struct
ah_data
*
ahp
,
struct
sk_buff
*
skb
,
u8
*
auth_data
)
{
...
...
@@ -27,7 +24,7 @@ ah_hmac_digest(struct ah_data *ahp, struct sk_buff *skb, u8 *auth_data)
memset
(
auth_data
,
0
,
ahp
->
icv_trunc_len
);
crypto_hmac_init
(
tfm
,
ahp
->
key
,
&
ahp
->
key_len
);
skb_
ah_walk
(
skb
,
tfm
,
crypto_hmac_update
);
skb_
icv_walk
(
skb
,
tfm
,
0
,
skb
->
len
,
crypto_hmac_update
);
crypto_hmac_final
(
tfm
,
ahp
->
key
,
&
ahp
->
key_len
,
ahp
->
work_icv
);
memcpy
(
auth_data
,
ahp
->
work_icv
,
ahp
->
icv_trunc_len
);
}
...
...
include/net/esp.h
View file @
de1354d6
...
...
@@ -33,8 +33,6 @@ struct esp_data
}
auth
;
};
extern
void
skb_icv_walk
(
const
struct
sk_buff
*
skb
,
struct
crypto_tfm
*
tfm
,
int
offset
,
int
len
,
icv_update_fn_t
icv_update
);
extern
int
skb_to_sgvec
(
struct
sk_buff
*
skb
,
struct
scatterlist
*
sg
,
int
offset
,
int
len
);
extern
int
skb_cow_data
(
struct
sk_buff
*
skb
,
int
tailbits
,
struct
sk_buff
**
trailer
);
extern
void
*
pskb_put
(
struct
sk_buff
*
skb
,
struct
sk_buff
*
tail
,
int
len
);
...
...
include/net/xfrm.h
View file @
de1354d6
...
...
@@ -781,4 +781,7 @@ extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name);
struct
crypto_tfm
;
typedef
void
(
icv_update_fn_t
)(
struct
crypto_tfm
*
,
struct
scatterlist
*
,
unsigned
int
);
extern
void
skb_icv_walk
(
const
struct
sk_buff
*
skb
,
struct
crypto_tfm
*
tfm
,
int
offset
,
int
len
,
icv_update_fn_t
icv_update
);
#endif
/* _NET_XFRM_H */
net/core/skbuff.c
View file @
de1354d6
...
...
@@ -195,46 +195,14 @@ struct sk_buff *alloc_skb(unsigned int size, int gfp_mask)
if
(
!
data
)
goto
nodata
;
/* XXX: does not include slab overhead */
skb
->
next
=
skb
->
prev
=
NULL
;
skb
->
list
=
NULL
;
skb
->
sk
=
NULL
;
skb
->
stamp
.
tv_sec
=
0
;
/* No idea about time */
skb
->
dev
=
NULL
;
skb
->
dst
=
NULL
;
skb
->
sp
=
NULL
;
memset
(
skb
->
cb
,
0
,
sizeof
(
skb
->
cb
));
/* Set up other state */
skb
->
len
=
0
;
skb
->
data_len
=
0
;
skb
->
csum
=
0
;
skb
->
local_df
=
0
;
skb
->
cloned
=
0
;
skb
->
pkt_type
=
PACKET_HOST
;
/* Default type */
skb
->
ip_summed
=
0
;
skb
->
priority
=
0
;
atomic_set
(
&
skb
->
users
,
1
);
skb
->
security
=
0
;
/* By default packets are insecure */
memset
(
skb
,
0
,
offsetof
(
struct
sk_buff
,
truesize
));
skb
->
truesize
=
size
+
sizeof
(
struct
sk_buff
);
/* Load the data pointers. */
skb
->
head
=
skb
->
data
=
skb
->
tail
=
data
;
atomic_set
(
&
skb
->
users
,
1
);
skb
->
head
=
data
;
skb
->
data
=
data
;
skb
->
tail
=
data
;
skb
->
end
=
data
+
size
;
skb
->
destructor
=
NULL
;
#ifdef CONFIG_NETFILTER
skb
->
nfmark
=
skb
->
nfcache
=
0
;
skb
->
nfct
=
NULL
;
#ifdef CONFIG_NETFILTER_DEBUG
skb
->
nf_debug
=
0
;
#endif
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
skb
->
nf_bridge
=
NULL
;
#endif
#endif
#ifdef CONFIG_NET_SCHED
skb
->
tc_index
=
0
;
#endif
atomic_set
(
&
(
skb_shinfo
(
skb
)
->
dataref
),
1
);
skb_shinfo
(
skb
)
->
nr_frags
=
0
;
skb_shinfo
(
skb
)
->
tso_size
=
0
;
...
...
@@ -367,10 +335,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask)
C
(
nh
);
C
(
mac
);
C
(
dst
);
dst_clone
(
n
->
dst
);
dst_clone
(
skb
->
dst
);
C
(
sp
);
#ifdef CONFIG_INET
secpath_get
(
n
->
sp
);
secpath_get
(
skb
->
sp
);
#endif
memcpy
(
n
->
cb
,
skb
->
cb
,
sizeof
(
skb
->
cb
));
C
(
len
);
...
...
@@ -381,24 +349,20 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask)
C
(
pkt_type
);
C
(
ip_summed
);
C
(
priority
);
atomic_set
(
&
n
->
users
,
1
);
C
(
protocol
);
C
(
security
);
C
(
truesize
);
C
(
head
);
C
(
data
);
C
(
tail
);
C
(
end
);
n
->
destructor
=
NULL
;
#ifdef CONFIG_NETFILTER
C
(
nfmark
);
C
(
nfcache
);
C
(
nfct
);
nf_conntrack_get
(
skb
->
nfct
);
#ifdef CONFIG_NETFILTER_DEBUG
C
(
nf_debug
);
#endif
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
C
(
nf_bridge
);
nf_bridge_get
(
skb
->
nf_bridge
);
#endif
#endif
/*CONFIG_NETFILTER*/
#if defined(CONFIG_HIPPI)
...
...
@@ -407,15 +371,16 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask)
#ifdef CONFIG_NET_SCHED
C
(
tc_index
);
#endif
C
(
truesize
);
atomic_set
(
&
n
->
users
,
1
);
C
(
head
);
C
(
data
);
C
(
tail
);
C
(
end
);
atomic_inc
(
&
(
skb_shinfo
(
skb
)
->
dataref
));
skb
->
cloned
=
1
;
#ifdef CONFIG_NETFILTER
nf_conntrack_get
(
skb
->
nfct
);
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
nf_bridge_get
(
skb
->
nf_bridge
);
#endif
#endif
return
n
;
}
...
...
@@ -439,7 +404,6 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new
->
nh
.
raw
=
old
->
nh
.
raw
+
offset
;
new
->
mac
.
raw
=
old
->
mac
.
raw
+
offset
;
memcpy
(
new
->
cb
,
old
->
cb
,
sizeof
(
old
->
cb
));
atomic_set
(
&
new
->
users
,
1
);
new
->
local_df
=
old
->
local_df
;
new
->
pkt_type
=
old
->
pkt_type
;
new
->
stamp
=
old
->
stamp
;
...
...
@@ -449,18 +413,19 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old)
new
->
nfmark
=
old
->
nfmark
;
new
->
nfcache
=
old
->
nfcache
;
new
->
nfct
=
old
->
nfct
;
nf_conntrack_get
(
new
->
nfct
);
nf_conntrack_get
(
old
->
nfct
);
#ifdef CONFIG_NETFILTER_DEBUG
new
->
nf_debug
=
old
->
nf_debug
;
#endif
#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
new
->
nf_bridge
=
old
->
nf_bridge
;
nf_bridge_get
(
new
->
nf_bridge
);
nf_bridge_get
(
old
->
nf_bridge
);
#endif
#endif
#ifdef CONFIG_NET_SCHED
new
->
tc_index
=
old
->
tc_index
;
#endif
atomic_set
(
&
new
->
users
,
1
);
}
/**
...
...
net/netsyms.c
View file @
de1354d6
...
...
@@ -356,13 +356,10 @@ EXPORT_SYMBOL_GPL(xfrm_calg_get_byid);
EXPORT_SYMBOL_GPL
(
xfrm_aalg_get_byname
);
EXPORT_SYMBOL_GPL
(
xfrm_ealg_get_byname
);
EXPORT_SYMBOL_GPL
(
xfrm_calg_get_byname
);
#if defined(CONFIG_INET_AH) || defined(CONFIG_INET_AH_MODULE) || defined(CONFIG_INET6_AH) || defined(CONFIG_INET6_AH_MODULE)
EXPORT_SYMBOL_GPL
(
skb_ah_walk
);
#endif
EXPORT_SYMBOL_GPL
(
skb_icv_walk
);
#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
EXPORT_SYMBOL_GPL
(
skb_cow_data
);
EXPORT_SYMBOL_GPL
(
pskb_put
);
EXPORT_SYMBOL_GPL
(
skb_icv_walk
);
EXPORT_SYMBOL_GPL
(
skb_to_sgvec
);
#endif
...
...
net/xfrm/xfrm_algo.c
View file @
de1354d6
...
...
@@ -440,83 +440,6 @@ int xfrm_count_enc_supported(void)
return
n
;
}
#if defined(CONFIG_INET_AH) || defined(CONFIG_INET_AH_MODULE) || defined(CONFIG_INET6_AH) || defined(CONFIG_INET6_AH_MODULE)
void
skb_ah_walk
(
const
struct
sk_buff
*
skb
,
struct
crypto_tfm
*
tfm
,
icv_update_fn_t
icv_update
)
{
int
offset
=
0
;
int
len
=
skb
->
len
;
int
start
=
skb
->
len
-
skb
->
data_len
;
int
i
,
copy
=
start
-
offset
;
struct
scatterlist
sg
;
/* Checksum header. */
if
(
copy
>
0
)
{
if
(
copy
>
len
)
copy
=
len
;
sg
.
page
=
virt_to_page
(
skb
->
data
+
offset
);
sg
.
offset
=
(
unsigned
long
)(
skb
->
data
+
offset
)
%
PAGE_SIZE
;
sg
.
length
=
copy
;
icv_update
(
tfm
,
&
sg
,
1
);
if
((
len
-=
copy
)
==
0
)
return
;
offset
+=
copy
;
}
for
(
i
=
0
;
i
<
skb_shinfo
(
skb
)
->
nr_frags
;
i
++
)
{
int
end
;
BUG_TRAP
(
start
<=
offset
+
len
);
end
=
start
+
skb_shinfo
(
skb
)
->
frags
[
i
].
size
;
if
((
copy
=
end
-
offset
)
>
0
)
{
skb_frag_t
*
frag
=
&
skb_shinfo
(
skb
)
->
frags
[
i
];
if
(
copy
>
len
)
copy
=
len
;
sg
.
page
=
frag
->
page
;
sg
.
offset
=
frag
->
page_offset
+
offset
-
start
;
sg
.
length
=
copy
;
icv_update
(
tfm
,
&
sg
,
1
);
if
(
!
(
len
-=
copy
))
return
;
offset
+=
copy
;
}
start
=
end
;
}
if
(
skb_shinfo
(
skb
)
->
frag_list
)
{
struct
sk_buff
*
list
=
skb_shinfo
(
skb
)
->
frag_list
;
for
(;
list
;
list
=
list
->
next
)
{
int
end
;
BUG_TRAP
(
start
<=
offset
+
len
);
end
=
start
+
list
->
len
;
if
((
copy
=
end
-
offset
)
>
0
)
{
if
(
copy
>
len
)
copy
=
len
;
skb_ah_walk
(
list
,
tfm
,
icv_update
);
if
((
len
-=
copy
)
==
0
)
return
;
offset
+=
copy
;
}
start
=
end
;
}
}
if
(
len
)
BUG
();
}
#endif
#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
/* Move to common area: it is shared with AH. */
void
skb_icv_walk
(
const
struct
sk_buff
*
skb
,
struct
crypto_tfm
*
tfm
,
...
...
@@ -591,6 +514,7 @@ void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
BUG
();
}
#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
/* Looking generic it is not used in another places. */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment