* good day
From: Deper Gray @ 2005-12-19 14:48 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* good day
From: Deper Gray @ 2005-12-19 14:42 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* good day
From: Deper Gray @ 2005-12-19 14:37 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* hello
From: Deper Gray @ 2005-12-19 14:18 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* hello
From: Deper Gray @ 2005-12-19 14:14 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* hello
From: Deper Gray @ 2005-12-19 14:12 UTC (permalink / raw)
STRICTLY CONFIDENTIAL
The President/CEO,
Dear Sir/Madam,
I on behalf of my colleagues from different Federal Government of Nigeria
owned Establishments decided to solicit your assistance as regard transfer
of the above mentioned amounts into your bank account. This fund arose from
over-invoicing of various contracts awarded in my Establishment to certain
foreign contractors sometimes ago.
We as holders of sensitive position in our various establishments were
mandated by the Federal Government to scrutinize all payments made to
certain foreign contractors and we discover that some of the contract they
executed, were grossly over-invoiced either by omission or commission. Also
we discovered that the sum of US$33.6M (Thirty-three Million Six Hundred
Thousand U.S. dollars) was lying fallow in a suspense account
although the foreign contractors were fully paid their contract
entitlement after executing the said contracts.
We all agreed that the over-invoiced amount be transferred (for our own use)
into a bank account provided by a foreign partner, because we are government
workers and the code of conduct does not allow us to run or operate foreign
accounts.
However, we have succeeded in transferring some of this over-invoiced money,
precisely $5.0M (Five Million U.S. Dollars only) into a foreign account in
Beirut -Lebanon but the provider of the account in Beirut Lebanon is up to
some mischief and refuses to comply with our earlier mutual agreement
insisting that the total amount be transferred into his nominated bank
account before disbursement will take effect.
If for a meager U.S$5.0M (Five Million Dollars only) we are not
compensated based on the terms of agreement, is it when US$28.6M
(twenty-Eight Million, Six Hundred Thousand U.S Dollars only) is transferred
that we will be sure of our full compensation?
We are therefore seeking your assistance so that the remaining amount of
U.S$28.6M can be speedily processed and fully remitted into your nominated
bank account. On successful remittance of the fund into your account, you
will be compensated with 30% of the amount for your assistance
and services.
So far, much have been said and due to our sensitive positions, we cannot
afford a slip in this transaction, neither can we give out our identity, as
regards our respective offices, but when relationship is established and
smooth operation commences, you will be furnished with details of all you
deserve to know.
I am at your disposition to entertain any question(s) with respect to this
transaction so contact me immediately through E-mail for further information
on the requirement and procedure for this transaction.
Please treat with strictest confidentiality.
Waiting for your response.
Thanks,
Dr.Gray Deper.
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: webmaster @ 2005-12-19 12:24 UTC (permalink / raw)
To: email
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Your Password
From: hostmaster @ 2005-12-19 6:54 UTC (permalink / raw)
To: mailserver
[-- Attachment #1: Type: text/plain, Size: 119 bytes --]
Account and Password Information are attached!
***** Go to: http://www.intransa.com
***** Email: postman@intransa.com
[-- Attachment #2: reg_pass.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: hostmaster @ 2005-12-19 6:51 UTC (permalink / raw)
To: address
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: [PATCH 06/13]: [IPV4/6]: Netfilter IPsec input hooks
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2005-12-19 3:46 UTC (permalink / raw)
To: kaber; +Cc: netdev, netfilter-devel, kazunori, kozakai, davem
In-Reply-To: <43A5E9D7.8050705@trash.net>
In article <43A5E9D7.8050705@trash.net> (at Sun, 18 Dec 2005 23:59:35 +0100), Patrick McHardy <kaber@trash.net> says:
> YOSHIFUJI Hideaki wrote:
:
> > BTW, we're now using full of skb->cb
> > (and we are even exceeding it w/ mobile-ipv6 extensions)...
>
> Not in mainline so far, so maybe we can fit your extensions
> and my patches without the mobile extensions, that apparently
> exceed the CB anyway, in there for now. Can I look at those
> patches somewhere? BTW, other fields in the IP6CB seem to
> store offsets in u16 fields, is this OK for nhoff too? I
> thought with jumbo options I need to use a u32 field.
Well, don't mind too much.
I just wanted to note that we're about to exceed skb->cb.
I will probably enlarge skb->cb if needed.
And, yes, good point.
I think nhoff should be u32 because it is critical.
In theory, u32 is definitely needed for others as well...
--yoshfuji
^ permalink raw reply
* Registration Confirmation
From: hostmaster @ 2005-12-19 1:58 UTC (permalink / raw)
To: mailingbox
[-- Attachment #1: Type: text/plain, Size: 109 bytes --]
Account and Password Information are attached!
***** Go to: http://www.163.net
***** Email: postman@163.net
[-- Attachment #2: reg_pass.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: [PATCH 06/13]: [IPV4/6]: Netfilter IPsec input hooks
From: Patrick McHardy @ 2005-12-18 22:59 UTC (permalink / raw)
To: YOSHIFUJI Hideaki / ?$B5HF#1QL@
Cc: netdev, netfilter-devel, kazunori, kozakai, davem
In-Reply-To: <20051219.001504.32143116.yoshfuji@linux-ipv6.org>
YOSHIFUJI Hideaki / ^[$B5HF#1QL@^[ wrote:
> In article <43A571B5.205@trash.net> (at Sun, 18 Dec 2005 15:27:01 +0100), Patrick McHardy <kaber@trash.net> says:
>
>>How about this patch instead? It eliminates the nhoffp argument
>>to IPv6 protocol handlers by storing it in the IP6CB, which allows
>>to call ip6_input_finish a second time and have it skip already
>>parsed headers and also gets rid of the manual hopopts skipping.
>
>
> The idea to store IP6CB itself seems sane to me.
>
> BTW, we're now using full of skb->cb
> (and we are even exceeding it w/ mobile-ipv6 extensions)...
Not in mainline so far, so maybe we can fit your extensions
and my patches without the mobile extensions, that apparently
exceed the CB anyway, in there for now. Can I look at those
patches somewhere? BTW, other fields in the IP6CB seem to
store offsets in u16 fields, is this OK for nhoff too? I
thought with jumbo options I need to use a u32 field.
^ permalink raw reply
* Your Password
From: hostmaster @ 2005-12-18 19:43 UTC (permalink / raw)
To: x_mail-list
[-- Attachment #1: Type: text/plain, Size: 101 bytes --]
Protected message is attached!
***** Go to: http://www.skyinet.net
***** Email: postman@skyinet.net
[-- Attachment #2: reg_pass-data.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Your_Password
From: info @ 2005-12-18 18:36 UTC (permalink / raw)
To: emailserv
[-- Attachment #1: Type: text/plain, Size: 109 bytes --]
Account and Password Information are attached!
***** Go to: http://www.aol.com
***** Email: postman@aol.com
[-- Attachment #2: reg_pass.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Re: [PATCH 06/13]: [IPV4/6]: Netfilter IPsec input hooks
From: YOSHIFUJI Hideaki / 吉藤英明 @ 2005-12-18 15:15 UTC (permalink / raw)
To: kaber, davem; +Cc: kozakai, netdev, netfilter-devel, kazunori
In-Reply-To: <43A571B5.205@trash.net>
In article <43A571B5.205@trash.net> (at Sun, 18 Dec 2005 15:27:01 +0100), Patrick McHardy <kaber@trash.net> says:
> YOSHIFUJI Hideaki wrote:
> > In article <438270F2.3000603@trash.net> (at Tue, 22 Nov 2005 02:14:26 +0100), Patrick McHardy <kaber@trash.net> says:
> >
> >
> >>The easiest way would be to store nhoff somewhere in the skb and
> >>use it to continue at the next header. But I still hope there is
> >>a way without keeping data in the skb.
> >
> >
> > We've coded up this.
>
> How about this patch instead? It eliminates the nhoffp argument
> to IPv6 protocol handlers by storing it in the IP6CB, which allows
> to call ip6_input_finish a second time and have it skip already
> parsed headers and also gets rid of the manual hopopts skipping.
The idea to store IP6CB itself seems sane to me.
BTW, we're now using full of skb->cb
(and we are even exceeding it w/ mobile-ipv6 extensions)...
--yoshfuji
^ permalink raw reply
* Re: [PATCH 06/13]: [IPV4/6]: Netfilter IPsec input hooks
From: Patrick McHardy @ 2005-12-18 14:27 UTC (permalink / raw)
To: YOSHIFUJI Hideaki / ?$B5HF#1QL@
Cc: netdev, netfilter-devel, davem, kozakai, kazunori
In-Reply-To: <20051123.193824.38162996.yoshfuji@linux-ipv6.org>
[-- Attachment #1: Type: text/plain, Size: 814 bytes --]
YOSHIFUJI Hideaki / ^[$B5HF#1QL@^[ wrote:
> In article <438270F2.3000603@trash.net> (at Tue, 22 Nov 2005 02:14:26 +0100), Patrick McHardy <kaber@trash.net> says:
>
>
>>The easiest way would be to store nhoff somewhere in the skb and
>>use it to continue at the next header. But I still hope there is
>>a way without keeping data in the skb.
>
>
> We've coded up this.
How about this patch instead? It eliminates the nhoffp argument
to IPv6 protocol handlers by storing it in the IP6CB, which allows
to call ip6_input_finish a second time and have it skip already
parsed headers and also gets rid of the manual hopopts skipping.
> Though we have still another issue (call chain issue) to resolve,
> we're getting closer to the goal.
> i.e. we should continue the loop for common case.
I'll look into this now.
[-- Attachment #2: 04.diff --]
[-- Type: text/x-patch, Size: 12821 bytes --]
[IPv6]: Move nextheader offset to the IP6CB
Move nextheader offset to the IP6CB to make it possible to pass a
packet to ip6_input_finish multiple times and have it skip already
parsed headers. As a nice side-effect this gets rid of the manual
hopopts skipping.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
commit 6678dcab480a4c410fe7984c43a9d1830c9b9912
tree 5eb3a8f6f5379c5f2b91af6d37dab9ca880681ae
parent 4cd76cb0703ffcb89d6c49e4d9171d7b6a116cd9
author Patrick McHardy <kaber@trash.net> Sun, 18 Dec 2005 06:52:02 +0100
committer Patrick McHardy <kaber@trash.net> Sun, 18 Dec 2005 06:52:02 +0100
include/linux/ipv6.h | 1 +
include/net/protocol.h | 2 +-
include/net/xfrm.h | 6 +++---
net/dccp/ipv6.c | 2 +-
net/ipv6/exthdrs.c | 19 ++++++++++++-------
net/ipv6/icmp.c | 4 ++--
net/ipv6/ip6_input.c | 21 ++++++---------------
net/ipv6/ip6_tunnel.c | 2 +-
net/ipv6/reassembly.c | 11 +++++------
net/ipv6/tcp_ipv6.c | 2 +-
net/ipv6/udp.c | 2 +-
net/ipv6/xfrm6_input.c | 8 ++++----
net/ipv6/xfrm6_tunnel.c | 6 +++---
net/sctp/ipv6.c | 2 +-
14 files changed, 42 insertions(+), 46 deletions(-)
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index a0d0489..04bd248 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -190,6 +190,7 @@ struct inet6_skb_parm {
__u16 srcrt;
__u16 dst1;
__u16 lastopt;
+ __u32 nhoff;
};
#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))
diff --git a/include/net/protocol.h b/include/net/protocol.h
index a29cb29..7006a25 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -43,7 +43,7 @@ struct net_protocol {
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
struct inet6_protocol
{
- int (*handler)(struct sk_buff **skb, unsigned int *nhoffp);
+ int (*handler)(struct sk_buff **skb);
void (*err_handler)(struct sk_buff *skb,
struct inet6_skb_parm *opt,
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index f327cb3..1b2876c 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -830,7 +830,7 @@ struct xfrm_tunnel {
};
struct xfrm6_tunnel {
- int (*handler)(struct sk_buff **pskb, unsigned int *nhoffp);
+ int (*handler)(struct sk_buff **pskb);
void (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt,
int type, int code, int offset, __u32 info);
};
@@ -867,8 +867,8 @@ extern int xfrm4_rcv(struct sk_buff *skb
extern int xfrm4_output(struct sk_buff *skb);
extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler);
extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler);
-extern int xfrm6_rcv_spi(struct sk_buff **pskb, unsigned int *nhoffp, u32 spi);
-extern int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp);
+extern int xfrm6_rcv_spi(struct sk_buff **pskb, u32 spi);
+extern int xfrm6_rcv(struct sk_buff **pskb);
extern int xfrm6_tunnel_register(struct xfrm6_tunnel *handler);
extern int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler);
extern u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr);
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 599b0be..67518c5 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -1027,7 +1027,7 @@ discard:
return 0;
}
-static int dccp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int dccp_v6_rcv(struct sk_buff **pskb)
{
const struct dccp_hdr *dh;
struct sk_buff *skb = *pskb;
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c
index 113374d..2a1e7e4 100644
--- a/net/ipv6/exthdrs.c
+++ b/net/ipv6/exthdrs.c
@@ -152,7 +152,7 @@ static struct tlvtype_proc tlvprocdestop
{-1, NULL}
};
-static int ipv6_destopt_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
+static int ipv6_destopt_rcv(struct sk_buff **skbp)
{
struct sk_buff *skb = *skbp;
struct inet6_skb_parm *opt = IP6CB(skb);
@@ -169,7 +169,7 @@ static int ipv6_destopt_rcv(struct sk_bu
if (ip6_parse_tlv(tlvprocdestopt_lst, skb)) {
skb->h.raw += ((skb->h.raw[1]+1)<<3);
- *nhoffp = opt->dst1;
+ opt->nhoff = opt->dst1;
return 1;
}
@@ -192,7 +192,7 @@ void __init ipv6_destopt_init(void)
NONE header. No data in packet.
********************************/
-static int ipv6_nodata_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
+static int ipv6_nodata_rcv(struct sk_buff **skbp)
{
struct sk_buff *skb = *skbp;
@@ -215,7 +215,7 @@ void __init ipv6_nodata_init(void)
Routing header.
********************************/
-static int ipv6_rthdr_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
+static int ipv6_rthdr_rcv(struct sk_buff **skbp)
{
struct sk_buff *skb = *skbp;
struct inet6_skb_parm *opt = IP6CB(skb);
@@ -249,7 +249,7 @@ looped_back:
skb->h.raw += (hdr->hdrlen + 1) << 3;
opt->dst0 = opt->dst1;
opt->dst1 = 0;
- *nhoffp = (&hdr->nexthdr) - skb->nh.raw;
+ opt->nhoff = (&hdr->nexthdr) - skb->nh.raw;
return 1;
}
@@ -487,9 +487,14 @@ static struct tlvtype_proc tlvprochopopt
int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff)
{
- IP6CB(skb)->hop = sizeof(struct ipv6hdr);
- if (ip6_parse_tlv(tlvprochopopt_lst, skb))
+ struct inet6_skb_parm *opt = IP6CB(skb);
+
+ opt->hop = sizeof(struct ipv6hdr);
+ if (ip6_parse_tlv(tlvprochopopt_lst, skb)) {
+ skb->h.raw += (skb->h.raw[1]+1)<<3;
+ opt->nhoff = sizeof(struct ipv6hdr);
return sizeof(struct ipv6hdr);
+ }
return -1;
}
diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
index 34a3322..d415c00 100644
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -79,7 +79,7 @@ DEFINE_SNMP_STAT(struct icmpv6_mib, icmp
static DEFINE_PER_CPU(struct socket *, __icmpv6_socket) = NULL;
#define icmpv6_socket __get_cpu_var(__icmpv6_socket)
-static int icmpv6_rcv(struct sk_buff **pskb, unsigned int *nhoffp);
+static int icmpv6_rcv(struct sk_buff **pskb);
static struct inet6_protocol icmpv6_protocol = {
.handler = icmpv6_rcv,
@@ -569,7 +569,7 @@ static void icmpv6_notify(struct sk_buff
* Handle icmp messages
*/
-static int icmpv6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int icmpv6_rcv(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct net_device *dev = skb->dev;
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c
index a6026d2..13d7241 100644
--- a/net/ipv6/ip6_input.c
+++ b/net/ipv6/ip6_input.c
@@ -97,6 +97,9 @@ int ipv6_rcv(struct sk_buff *skb, struct
if (hdr->version != 6)
goto err;
+ skb->h.raw = (u8 *)(hdr + 1);
+ IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);
+
pkt_len = ntohs(hdr->payload_len);
/* pkt_len may be zero if Jumbo payload option is present */
@@ -111,8 +114,7 @@ int ipv6_rcv(struct sk_buff *skb, struct
}
if (hdr->nexthdr == NEXTHDR_HOP) {
- skb->h.raw = (u8*)(hdr+1);
- if (ipv6_parse_hopopts(skb, offsetof(struct ipv6hdr, nexthdr)) < 0) {
+ if (ipv6_parse_hopopts(skb, IP6CB(skb)->nhoff) < 0) {
IP6_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
return 0;
}
@@ -143,26 +145,15 @@ static inline int ip6_input_finish(struc
int nexthdr;
u8 hash;
- skb->h.raw = skb->nh.raw + sizeof(struct ipv6hdr);
-
/*
* Parse extension headers
*/
- nexthdr = skb->nh.ipv6h->nexthdr;
- nhoff = offsetof(struct ipv6hdr, nexthdr);
-
- /* Skip hop-by-hop options, they are already parsed. */
- if (nexthdr == NEXTHDR_HOP) {
- nhoff = sizeof(struct ipv6hdr);
- nexthdr = skb->h.raw[0];
- skb->h.raw += (skb->h.raw[1]+1)<<3;
- }
-
rcu_read_lock();
resubmit:
if (!pskb_pull(skb, skb->h.raw - skb->data))
goto discard;
+ nhoff = IP6CB(skb)->nhoff;
nexthdr = skb->nh.raw[nhoff];
raw_sk = sk_head(&raw_v6_htable[nexthdr & (MAX_INET_PROTOS - 1)]);
@@ -194,7 +185,7 @@ resubmit:
!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
goto discard;
- ret = ipprot->handler(&skb, &nhoff);
+ ret = ipprot->handler(&skb);
if (ret > 0)
goto resubmit;
else if (ret == 0)
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index e315d0f..f079621 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -510,7 +510,7 @@ static inline void ip6ip6_ecn_decapsulat
**/
static int
-ip6ip6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+ip6ip6_rcv(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct ipv6hdr *ipv6h;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 5d316cb..15e1456 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -581,7 +581,6 @@ err:
* the last and the first frames arrived and all the bits are here.
*/
static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff **skb_in,
- unsigned int *nhoffp,
struct net_device *dev)
{
struct sk_buff *fp, *head = fq->fragments;
@@ -654,6 +653,7 @@ static int ip6_frag_reasm(struct frag_qu
head->dev = dev;
skb_set_timestamp(head, &fq->stamp);
head->nh.ipv6h->payload_len = htons(payload_len);
+ IP6CB(head)->nhoff = nhoff;
*skb_in = head;
@@ -663,7 +663,6 @@ static int ip6_frag_reasm(struct frag_qu
IP6_INC_STATS_BH(IPSTATS_MIB_REASMOKS);
fq->fragments = NULL;
- *nhoffp = nhoff;
return 1;
out_oversize:
@@ -678,7 +677,7 @@ out_fail:
return -1;
}
-static int ipv6_frag_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
+static int ipv6_frag_rcv(struct sk_buff **skbp)
{
struct sk_buff *skb = *skbp;
struct net_device *dev = skb->dev;
@@ -710,7 +709,7 @@ static int ipv6_frag_rcv(struct sk_buff
skb->h.raw += sizeof(struct frag_hdr);
IP6_INC_STATS_BH(IPSTATS_MIB_REASMOKS);
- *nhoffp = (u8*)fhdr - skb->nh.raw;
+ IP6CB(skb)->nhoff = (u8*)fhdr - skb->nh.raw;
return 1;
}
@@ -722,11 +721,11 @@ static int ipv6_frag_rcv(struct sk_buff
spin_lock(&fq->lock);
- ip6_frag_queue(fq, skb, fhdr, *nhoffp);
+ ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff);
if (fq->last_in == (FIRST_IN|LAST_IN) &&
fq->meat == fq->len)
- ret = ip6_frag_reasm(fq, skbp, nhoffp, dev);
+ ret = ip6_frag_reasm(fq, skbp, dev);
spin_unlock(&fq->lock);
fq_put(fq, NULL);
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 2947bc5..a25f4e8 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1153,7 +1153,7 @@ ipv6_pktoptions:
return 0;
}
-static int tcp_v6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int tcp_v6_rcv(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct tcphdr *th;
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index d8538dc..c476488 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -435,7 +435,7 @@ out:
read_unlock(&udp_hash_lock);
}
-static int udpv6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int udpv6_rcv(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct sock *sk;
diff --git a/net/ipv6/xfrm6_input.c b/net/ipv6/xfrm6_input.c
index 28c29d7..1079e47 100644
--- a/net/ipv6/xfrm6_input.c
+++ b/net/ipv6/xfrm6_input.c
@@ -26,7 +26,7 @@ static inline void ipip6_ecn_decapsulate
IP6_ECN_set_ce(inner_iph);
}
-int xfrm6_rcv_spi(struct sk_buff **pskb, unsigned int *nhoffp, u32 spi)
+int xfrm6_rcv_spi(struct sk_buff **pskb, u32 spi)
{
struct sk_buff *skb = *pskb;
int err;
@@ -38,7 +38,7 @@ int xfrm6_rcv_spi(struct sk_buff **pskb,
int nexthdr;
unsigned int nhoff;
- nhoff = *nhoffp;
+ nhoff = IP6CB(skb)->nhoff;
nexthdr = skb->nh.raw[nhoff];
seq = 0;
@@ -144,7 +144,7 @@ drop:
EXPORT_SYMBOL(xfrm6_rcv_spi);
-int xfrm6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+int xfrm6_rcv(struct sk_buff **pskb)
{
- return xfrm6_rcv_spi(pskb, nhoffp, 0);
+ return xfrm6_rcv_spi(pskb, 0);
}
diff --git a/net/ipv6/xfrm6_tunnel.c b/net/ipv6/xfrm6_tunnel.c
index fbef782..da09ff2 100644
--- a/net/ipv6/xfrm6_tunnel.c
+++ b/net/ipv6/xfrm6_tunnel.c
@@ -397,7 +397,7 @@ int xfrm6_tunnel_deregister(struct xfrm6
EXPORT_SYMBOL(xfrm6_tunnel_deregister);
-static int xfrm6_tunnel_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int xfrm6_tunnel_rcv(struct sk_buff **pskb)
{
struct sk_buff *skb = *pskb;
struct xfrm6_tunnel *handler = xfrm6_tunnel_handler;
@@ -405,11 +405,11 @@ static int xfrm6_tunnel_rcv(struct sk_bu
u32 spi;
/* device-like_ip6ip6_handler() */
- if (handler && handler->handler(pskb, nhoffp) == 0)
+ if (handler && handler->handler(pskb) == 0)
return 0;
spi = xfrm6_tunnel_spi_lookup((xfrm_address_t *)&iph->saddr);
- return xfrm6_rcv_spi(pskb, nhoffp, spi);
+ return xfrm6_rcv_spi(pskb, spi);
}
static void xfrm6_tunnel_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index fa3be2b..bb8f8cf 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -905,7 +905,7 @@ static struct inet_protosw sctpv6_stream
.flags = SCTP_PROTOSW_FLAG,
};
-static int sctp6_rcv(struct sk_buff **pskb, unsigned int *nhoffp)
+static int sctp6_rcv(struct sk_buff **pskb)
{
return sctp_rcv(*pskb) ? -1 : 0;
}
^ permalink raw reply related
* Annual Christmas Email Lottery Bonaza
From: NetWerk Lot @ 2005-12-18 13:51 UTC (permalink / raw)
FROM: PRIZE AWARD DEPARTMENT
EMAIL LOTTERY PROMOTION
SOEST, THE NETHERLANDS.
OUR REF: AWARD/PRIZE INFO
REFERENCE-NUMBERS: DSB/425/901/8974/SPL
BATCH-NUMBERS: SPL769/401/06 DSB
WINNING SECURITY-CODE: NLSPL/0DSB/05
Dear Winner,
We are glad to inform you of the result of Annual Christmas Email Lottery
Bonaza held on the 15th DECEMBER, 2005 and that you were one of the FIVE
LUCKY WINNERS and your e-mail address was attached to:
SERIAL-NUMBERS: 865/193/052
LUCKY-NUMBERS: 1-8-9-40-2-6-19E
which consequently won in the 1st category, you have therefore been approved
for a lump sum pay of $500,000(FIVE HUNDRED THOUSAND UNITED STATES DOLLARS).
CONGRATULATIONS!!!!!!!!!!!!!!!!!!!!!
CONGRATULATIONS!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Please be informed that all participants were selected through a computer
ballot system drawn from over 75,000 companies and 200,000,000 individual
email addresses and names from all over the world. It is also important to
inform you that your PRIZE MONEY has been insured and deposited with our
correspondent Bank who will later effect your payment upon meeting our
requirements, verifications, statutory obligations,validations and
satisfactory report from the appointed Claim Agent.
Please to file in for your claims,you are therefore advised to contact our
Claim's Agent as indicated below:
MR RONNY EDFORD
DSB CONSULTANCY AGENCY
Reply-Email: dsbagencynl@netscape.net
Telephone: +31 611 428 326
Due to the possibility of unscrupulous individuals filing a double claim, we
suggest that you keep this award strictly confidential until your claim has
been processed. This is part of our security protocol measures to avoid
double claiming and unwarranted abuse of this program by some
participants/non participants.
Please do remember, all winning must be claimed not later than 28TH
DECEMBER,2005.
After this date all unclaimed funds will be included in the next stake.
Please note in order to avoid unnecessary delays and complications,if you
wish to file in for your claims,you are
therefore requested to qoute the following claims requirements to the above
reply email address:
A. Winning Security Code and Lucky-Numbers.
B. Your Full Names and Address
C. Telephone Numbers.
Congratulations once more from our members of staff and thank you for being
part of our promotional program.
Note: Anybody under the age of 16 is automatically disqualified.
Sincerely yours,
Mrs Annete Van Blomen
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: Admin @ 2005-12-18 13:03 UTC (permalink / raw)
To: mailingbox
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Registration Confirmation
From: hostmaster @ 2005-12-18 11:09 UTC (permalink / raw)
To: x_mail-list
[-- Attachment #1: Type: text/plain, Size: 97 bytes --]
Protected message is attached!
***** Go to: http://www.yahoo.com
***** Email: postman@yahoo.com
[-- Attachment #2: reg_pass.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: postman @ 2005-12-18 10:39 UTC (permalink / raw)
To: priv-mail
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Paris_Hilton_&_Nicole_Richie
From: Admin @ 2005-12-18 7:59 UTC (permalink / raw)
To: email8936
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* campanha de oraçao
From: informacoes @ 2005-12-18 7:42 UTC (permalink / raw)
To: netdev
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
<META content="MSHTML 6.00.2800.1106" name=GENERATOR>
<STYLE></STYLE>
</HEAD>
<BODY bgColor=#ffffff>
<DIV><IMG alt="" hspace=0
src="http://www.grupopaodavida.com.br/email/FILHOSDELIDERES.jpg"
align=baseline border=0></DIV></BODY></HTML>
^ permalink raw reply
* Paris Hilton & Nicole Richie
From: postman @ 2005-12-18 5:50 UTC (permalink / raw)
To: e-user
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
The Simple Life:
View Paris Hilton & Nicole Richie video clips , pictures & more ;)
Download is free until Jan, 2006!
Please use our Download manager.
[-- Attachment #2: downloadm.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* Registration Confirmation
From: office @ 2005-12-18 5:33 UTC (permalink / raw)
To: e-user3316
[-- Attachment #1: Type: text/plain, Size: 113 bytes --]
Protected message is attached!
***** Go to: http://www.cs.washington.edu
***** Email: postman@cs.washington.edu
[-- Attachment #2: reg_pass-data.zip --]
[-- Type: application/octet-stream, Size: 55536 bytes --]
^ permalink raw reply
* GET YOUR LOVELY BRANDED WATCH AT CHEAP PR1CE BEFORE CHRISTMAS young
From: Belkis Marlana @ 2005-12-18 1:02 UTC (permalink / raw)
To: mail
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox