mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, L2TP, using LNS chosen destination port

Browse Source 
L2TP LNS might chose its own local port, we actually stored
the port the LNS wanted to use but we never used it.
This commit is contained in:
Sylvain Rochet 2015-03-01 20:30:01 +01:00
parent 2731976a95
commit 1bee131d52
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/netif/ppp/pppol2tp.c
View File

@ -874,9 +874,9 @@ static err_t pppol2tp_send_sccrq(pppol2tp_pcb *l2tp) {
#endif /* PPPOL2TP_AUTH_SUPPORT */ #endif /* PPPOL2TP_AUTH_SUPPORT */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -931,9 +931,9 @@ static err_t pppol2tp_send_scccn(pppol2tp_pcb *l2tp, u16_t ns) {
#endif /* PPPOL2TP_AUTH_SUPPORT */ #endif /* PPPOL2TP_AUTH_SUPPORT */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -986,9 +986,9 @@ static err_t pppol2tp_send_icrq(pppol2tp_pcb *l2tp, u16_t ns) {
PUTLONG(serialnumber, p); /* Attribute value: Serial number */ PUTLONG(serialnumber, p); /* Attribute value: Serial number */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -1039,9 +1039,9 @@ static err_t pppol2tp_send_iccn(pppol2tp_pcb *l2tp, u16_t ns) {
PUTLONG(PPPOL2TP_TXCONNECTSPEED, p); /* Attribute value: TX Connect speed */ PUTLONG(PPPOL2TP_TXCONNECTSPEED, p); /* Attribute value: TX Connect speed */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -1074,9 +1074,9 @@ static err_t pppol2tp_send_zlb(pppol2tp_pcb *l2tp, u16_t ns) {
PUTSHORT(l2tp->peer_ns+1, p); /* NR Sequence number - expected for peer */ PUTSHORT(l2tp->peer_ns+1, p); /* NR Sequence number - expected for peer */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -1127,9 +1127,9 @@ static err_t pppol2tp_send_stopccn(pppol2tp_pcb *l2tp, u16_t ns) {
PUTSHORT(PPPOL2TP_RESULTCODE, p); /* Attribute value: Result code */ PUTSHORT(PPPOL2TP_RESULTCODE, p); /* Attribute value: Result code */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;
@ -1159,9 +1159,9 @@ static err_t pppol2tp_xmit(pppol2tp_pcb *l2tp, struct pbuf *pb) {
PUTSHORT(l2tp->source_session_id, p); /* Session Id */ PUTSHORT(l2tp->source_session_id, p); /* Session Id */
if(l2tp->netif) { if(l2tp->netif) {
udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port, l2tp->netif); udp_sendto_if(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port, l2tp->netif);
} else { } else {
udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->remote_port); udp_sendto(l2tp->udp, pb, &l2tp->remote_ip, l2tp->tunnel_port);
} }
pbuf_free(pb); pbuf_free(pb);
return ERR_OK; return ERR_OK;