projects
/
l2tpns.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: loopback protection
[l2tpns.git]
/
icmp.c
diff --git
a/icmp.c
b/icmp.c
index
aefd768
..
6d90467
100644
(file)
--- a/
icmp.c
+++ b/
icmp.c
@@
-1,7
+1,5
@@
// L2TPNS: icmp
// L2TPNS: icmp
-char const *cvs_id_icmp = "$Id: icmp.c,v 1.8 2005/06/04 15:42:06 bodea Exp $";
-
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
@@
-18,7
+16,7
@@
char const *cvs_id_icmp = "$Id: icmp.c,v 1.8 2005/06/04 15:42:06 bodea Exp $";
#include "l2tpns.h"
#include "l2tpns.h"
-static uint16_t _checksum(u
nsigned char
*addr, int count);
+static uint16_t _checksum(u
int8_t
*addr, int count);
struct ipv6_pseudo_hdr {
struct in6_addr src;
struct ipv6_pseudo_hdr {
struct in6_addr src;
@@
-28,7
+26,7
@@
struct ipv6_pseudo_hdr {
uint32_t nexthdr : 8;
};
uint32_t nexthdr : 8;
};
-void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source,
char
*packet, int packet_len)
+void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source,
uint8_t
*packet, int packet_len)
{
char buf[128] = {0};
struct iphdr *iph;
{
char buf[128] = {0};
struct iphdr *iph;
@@
-72,15
+70,15
@@
void host_unreachable(in_addr_t destination, uint16_t id, in_addr_t source, char
icmp->type = ICMP_DEST_UNREACH;
icmp->code = ICMP_HOST_UNREACH;
icmp->type = ICMP_DEST_UNREACH;
icmp->code = ICMP_HOST_UNREACH;
- icmp->checksum = _checksum((
char
*) icmp, sizeof(struct icmphdr) + packet_len);
+ icmp->checksum = _checksum((
uint8_t
*) icmp, sizeof(struct icmphdr) + packet_len);
- iph->check = _checksum((
char
*) iph, sizeof(struct iphdr));
+ iph->check = _checksum((
uint8_t
*) iph, sizeof(struct iphdr));
- sendto(icmp_socket,
(char *)
buf, len, 0, (struct sockaddr *)&whereto, sizeof(struct sockaddr));
+ sendto(icmp_socket, buf, len, 0, (struct sockaddr *)&whereto, sizeof(struct sockaddr));
close(icmp_socket);
}
close(icmp_socket);
}
-static uint16_t _checksum(u
nsigned char
*addr, int count)
+static uint16_t _checksum(u
int8_t
*addr, int count)
{
register long sum = 0;
{
register long sum = 0;
@@
-102,7
+100,7
@@
static uint16_t _checksum(unsigned char *addr, int count)
return htons((uint16_t) sum);
}
return htons((uint16_t) sum);
}
-void send_ipv6_ra(
tunnelidt t, sessionidt s
, struct in6_addr *ip)
+void send_ipv6_ra(
sessionidt s, tunnelidt t
, struct in6_addr *ip)
{
struct nd_opt_prefix_info *pinfo;
struct ipv6_pseudo_hdr *phdr;
{
struct nd_opt_prefix_info *pinfo;
struct ipv6_pseudo_hdr *phdr;
@@
-114,7
+112,7
@@
void send_ipv6_ra(tunnelidt t, sessionidt s, struct in6_addr *ip)
LOG(3, s, t, "Sending IPv6 RA\n");
memset(b, 0, sizeof(b));
LOG(3, s, t, "Sending IPv6 RA\n");
memset(b, 0, sizeof(b));
- o = makeppp(b, sizeof(b), 0, 0,
t, s, PPPIPV6
);
+ o = makeppp(b, sizeof(b), 0, 0,
s, t, PPPIPV6, 0, 0, 0
);
if (!o)
{
if (!o)
{