Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Achou.Wang
accel-ppp
提交
41ef1132
A
accel-ppp
项目概览
Achou.Wang
/
accel-ppp
通知
6
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
accel-ppp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
41ef1132
编写于
4月 25, 2013
作者:
K
Kozlov Dmitry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ipoe: detect giaddr if not specified
上级
22ecfca7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
16 deletion
+32
-16
accel-pppd/ctrl/ipoe/dhcpv4.c
accel-pppd/ctrl/ipoe/dhcpv4.c
+29
-13
accel-pppd/ctrl/ipoe/ipoe.c
accel-pppd/ctrl/ipoe/ipoe.c
+3
-3
未找到文件。
accel-pppd/ctrl/ipoe/dhcpv4.c
浏览文件 @
41ef1132
...
@@ -27,8 +27,7 @@
...
@@ -27,8 +27,7 @@
#define BUF_SIZE 4096
#define BUF_SIZE 4096
struct
dhcpv4_relay_ctx
struct
dhcpv4_relay_ctx
{
{
struct
list_head
entry
;
struct
list_head
entry
;
struct
triton_context_t
*
ctx
;
struct
triton_context_t
*
ctx
;
triton_event_func
recv
;
triton_event_func
recv
;
...
@@ -796,9 +795,10 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
...
@@ -796,9 +795,10 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
struct
dhcpv4_relay
*
r
;
struct
dhcpv4_relay
*
r
;
in_addr_t
addr
;
// = inet_addr(_addr);
in_addr_t
addr
;
// = inet_addr(_addr);
int
port
=
DHCP_SERV_PORT
;
int
port
=
DHCP_SERV_PORT
;
in_addr_t
giaddr
=
inet_addr
(
_giaddr
);
in_addr_t
giaddr
;
//
= inet_addr(_giaddr);
struct
sockaddr_in
raddr
;
struct
sockaddr_in
raddr
;
struct
sockaddr_in
laddr
;
struct
sockaddr_in
laddr
;
socklen_t
len
=
sizeof
(
laddr
);
int
sock
=
-
1
;
int
sock
=
-
1
;
int
f
=
1
;
int
f
=
1
;
struct
dhcpv4_relay_ctx
*
c
;
struct
dhcpv4_relay_ctx
*
c
;
...
@@ -811,6 +811,32 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
...
@@ -811,6 +811,32 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
port
=
atoi
(
ptr
+
1
);
port
=
atoi
(
ptr
+
1
);
}
else
}
else
addr
=
inet_addr
(
_addr
);
addr
=
inet_addr
(
_addr
);
memset
(
&
raddr
,
0
,
sizeof
(
raddr
));
raddr
.
sin_family
=
AF_INET
;
raddr
.
sin_addr
.
s_addr
=
addr
;
raddr
.
sin_port
=
htons
(
port
);
if
(
_giaddr
)
giaddr
=
inet_addr
(
_giaddr
);
else
{
sock
=
socket
(
PF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
if
(
connect
(
sock
,
&
raddr
,
sizeof
(
raddr
)))
{
log_error
(
"dhcpv4: relay: %s: connect: %s
\n
"
,
_addr
,
strerror
(
errno
));
goto
out_err
;
}
getsockname
(
sock
,
&
laddr
,
&
len
);
giaddr
=
laddr
.
sin_addr
.
s_addr
;
close
(
sock
);
}
memset
(
&
laddr
,
0
,
sizeof
(
laddr
));
laddr
.
sin_family
=
AF_INET
;
laddr
.
sin_addr
.
s_addr
=
giaddr
;
laddr
.
sin_port
=
htons
(
DHCP_SERV_PORT
);
list_for_each_entry
(
r
,
&
relay_list
,
entry
)
{
list_for_each_entry
(
r
,
&
relay_list
,
entry
)
{
if
(
r
->
addr
==
addr
&&
r
->
giaddr
==
giaddr
)
if
(
r
->
addr
==
addr
&&
r
->
giaddr
==
giaddr
)
...
@@ -823,16 +849,6 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
...
@@ -823,16 +849,6 @@ struct dhcpv4_relay *dhcpv4_relay_create(const char *_addr, const char *_giaddr,
r
->
addr
=
addr
;
r
->
addr
=
addr
;
r
->
giaddr
=
giaddr
;
r
->
giaddr
=
giaddr
;
memset
(
&
raddr
,
0
,
sizeof
(
raddr
));
raddr
.
sin_family
=
AF_INET
;
raddr
.
sin_addr
.
s_addr
=
addr
;
raddr
.
sin_port
=
htons
(
port
);
memset
(
&
laddr
,
0
,
sizeof
(
laddr
));
laddr
.
sin_family
=
AF_INET
;
laddr
.
sin_addr
.
s_addr
=
giaddr
;
laddr
.
sin_port
=
htons
(
DHCP_SERV_PORT
);
sock
=
socket
(
PF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
sock
=
socket
(
PF_INET
,
SOCK_DGRAM
,
IPPROTO_UDP
);
if
(
!
sock
)
{
if
(
!
sock
)
{
log_error
(
"socket: %s
\n
"
,
strerror
(
errno
));
log_error
(
"socket: %s
\n
"
,
strerror
(
errno
));
...
...
accel-pppd/ctrl/ipoe/ipoe.c
浏览文件 @
41ef1132
...
@@ -378,7 +378,6 @@ static void ipoe_session_start(struct ipoe_session *ses)
...
@@ -378,7 +378,6 @@ static void ipoe_session_start(struct ipoe_session *ses)
if
(
ses
->
serv
->
opt_shared
==
0
&&
(
!
ses
->
ses
.
ipv4
||
ses
->
ses
.
ipv4
->
peer_addr
==
ses
->
yiaddr
))
{
if
(
ses
->
serv
->
opt_shared
==
0
&&
(
!
ses
->
ses
.
ipv4
||
ses
->
ses
.
ipv4
->
peer_addr
==
ses
->
yiaddr
))
{
strncpy
(
ses
->
ses
.
ifname
,
ses
->
serv
->
ifname
,
AP_IFNAME_LEN
);
strncpy
(
ses
->
ses
.
ifname
,
ses
->
serv
->
ifname
,
AP_IFNAME_LEN
);
ses
->
ses
.
ifindex
=
ses
->
serv
->
ifindex
;
ses
->
ses
.
ifindex
=
ses
->
serv
->
ifindex
;
ses
->
ctrl
.
dont_ifcfg
=
1
;
}
else
if
(
ses
->
ifindex
==
-
1
)
{
}
else
if
(
ses
->
ifindex
==
-
1
)
{
pthread_mutex_lock
(
&
uc_lock
);
pthread_mutex_lock
(
&
uc_lock
);
if
(
!
list_empty
(
&
uc_list
))
{
if
(
!
list_empty
(
&
uc_list
))
{
...
@@ -410,6 +409,7 @@ static void ipoe_session_start(struct ipoe_session *ses)
...
@@ -410,6 +409,7 @@ static void ipoe_session_start(struct ipoe_session *ses)
strncpy
(
ses
->
ses
.
ifname
,
ifr
.
ifr_name
,
AP_IFNAME_LEN
);
strncpy
(
ses
->
ses
.
ifname
,
ifr
.
ifr_name
,
AP_IFNAME_LEN
);
ses
->
ses
.
ifindex
=
ses
->
ifindex
;
ses
->
ses
.
ifindex
=
ses
->
ifindex
;
ses
->
ses
.
unit_idx
=
ses
->
ifindex
;
ses
->
ses
.
unit_idx
=
ses
->
ifindex
;
ses
->
ctrl
.
dont_ifcfg
=
0
;
}
}
ap_session_set_ifindex
(
&
ses
->
ses
);
ap_session_set_ifindex
(
&
ses
->
ses
);
...
@@ -1511,7 +1511,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt)
...
@@ -1511,7 +1511,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt)
serv
->
dhcpv4_relay
=
NULL
;
serv
->
dhcpv4_relay
=
NULL
;
}
}
if
(
serv
->
opt_dhcpv4
&&
opt_relay
&&
opt_giaddr
)
{
if
(
serv
->
opt_dhcpv4
&&
opt_relay
)
{
if
(
opt_ifcfg
)
if
(
opt_ifcfg
)
ipoe_serv_add_addr
(
serv
,
giaddr
);
ipoe_serv_add_addr
(
serv
,
giaddr
);
serv
->
dhcpv4_relay
=
dhcpv4_relay_create
(
opt_relay
,
opt_giaddr
,
&
serv
->
ctx
,
(
triton_event_func
)
ipoe_recv_dhcpv4_relay
);
serv
->
dhcpv4_relay
=
dhcpv4_relay_create
(
opt_relay
,
opt_giaddr
,
&
serv
->
ctx
,
(
triton_event_func
)
ipoe_recv_dhcpv4_relay
);
...
@@ -1550,7 +1550,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt)
...
@@ -1550,7 +1550,7 @@ static void add_interface(const char *ifname, int ifindex, const char *opt)
if
(
serv
->
dhcpv4
)
if
(
serv
->
dhcpv4
)
serv
->
dhcpv4
->
recv
=
ipoe_recv_dhcpv4
;
serv
->
dhcpv4
->
recv
=
ipoe_recv_dhcpv4
;
if
(
opt_relay
&&
opt_giaddr
)
{
if
(
opt_relay
)
{
if
(
opt_ifcfg
)
if
(
opt_ifcfg
)
ipoe_serv_add_addr
(
serv
,
giaddr
);
ipoe_serv_add_addr
(
serv
,
giaddr
);
serv
->
dhcpv4_relay
=
dhcpv4_relay_create
(
opt_relay
,
opt_giaddr
,
&
serv
->
ctx
,
(
triton_event_func
)
ipoe_recv_dhcpv4_relay
);
serv
->
dhcpv4_relay
=
dhcpv4_relay_create
(
opt_relay
,
opt_giaddr
,
&
serv
->
ctx
,
(
triton_event_func
)
ipoe_recv_dhcpv4_relay
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录