sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

gatppp: fix ppp protocol-reject constructing error 

In PPP Protocol-Reject package the 'rejected data field' should be a copy
of the rejected package, the copy starts from the data field. besides,
Protocol-Reject package include a 'rejected protocol field', it is the
same as the protocol field of the rejected package.

Protocol-Reject package structure is:

	| PPP_header | rejected protocol | rejected data

The rejected package structure is:
	| Addr | Control | protocol | data

So the Protocol-Reject package data field is copied from the 3rd byte of
the rejected package.
This commit is contained in:
Caiwen Zhang 2011-05-11 16:15:19 +08:00 committed by Denis Kenzior
parent 652f2963ae
commit 37d04bee15
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gatchat/ppp_cp.c
View File

@ -922,7 +922,8 @@ void pppcp_send_protocol_reject(struct pppcp_data *data,
* info should contain the old packet info, plus the 16bit
* protocol number we are rejecting.
*/
packet = pppcp_packet_new(data, PPPCP_CODE_TYPE_PROTOCOL_REJECT, len);
packet = pppcp_packet_new(data, PPPCP_CODE_TYPE_PROTOCOL_REJECT,
len - 2);
/*
* Identifier must be changed for each Protocol-Reject sent
@ -933,8 +934,7 @@ void pppcp_send_protocol_reject(struct pppcp_data *data,
* rejected packet should be copied in, but it should be
* truncated if it needs to be to comply with mtu requirement
*/
memcpy(packet->data, rejected_packet,
(ntohs(packet->length) - CP_HEADER_SZ));
memcpy(packet->data, rejected_packet + 2, len - 2);
ppp_transmit(data->ppp, pppcp_to_ppp_packet(packet),
ntohs(packet->length));