Send the peer-decided PSTN address with the CBCP Ack,

otherwise windows clients will keep resending the
response :-/
It'd be nice if M$ would document this sort of thing !
Problem reported by: Andrzej Tobola <san@tmp.iem.pw.edu.pl>
This commit is contained in:
Brian Somers 1999-01-19 22:15:25 +00:00
parent ad56ea87a1
commit 8e1fea3105
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42842

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cbcp.c,v 1.6 1998/10/25 23:35:15 brian Exp $
* $Id: cbcp.c,v 1.7 1998/10/31 17:38:48 brian Exp $
*/
#include <sys/types.h>
@ -568,7 +568,7 @@ static void
cbcp_SendAck(struct cbcp *cbcp)
{
struct cbcp_data data;
char *end;
struct cbcp_addr *addr;
/* Only callees send ACKs */
@ -576,9 +576,22 @@ cbcp_SendAck(struct cbcp *cbcp)
cbcp->fsm.id, cbcpstate(cbcp->fsm.state));
data.type = cbcp->fsm.type;
data.delay = cbcp->fsm.delay;
end = data.type == CBCP_NONUM ? (char *)&data.delay : data.addr_start;
data.length = end - (char *)&data;
switch (data.type) {
case CBCP_NONUM:
data.length = (char *)&data.delay - (char *)&data;
break;
case CBCP_CLIENTNUM:
addr = (struct cbcp_addr *)data.addr_start;
addr->type = CBCP_ADDR_PSTN;
strcpy(addr->addr, cbcp->fsm.phone);
data.delay = cbcp->fsm.delay;
data.length = addr->addr + strlen(addr->addr) + 1 - (char *)&data;
break;
default:
data.delay = cbcp->fsm.delay;
data.length = data.addr_start - (char *)&data;
break;
}
cbcp_data_Show(&data);
cbcp_Output(cbcp, CBCP_ACK, &data);