oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

s/net_write/telnet_net_write/

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5072 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-07-09 23:16:40 +00:00
parent b546ea105d
commit 5c4a9b57f0
15 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appl/telnet/libtelnet/auth.c
View File

@@ -378,7 +378,7 @@ auth_request(void)
} }
*e++ = IAC; *e++ = IAC;
*e++ = SE; *e++ = SE;
net_write(str_request, e - str_request); telnet_net_write(str_request, e - str_request);
printsub('>', &str_request[2], e - str_request - 2); printsub('>', &str_request[2], e - str_request - 2);
} }
} }
@@ -463,7 +463,7 @@ auth_send(unsigned char *data, int cnt)
} }
auth_send_data += 2; auth_send_data += 2;
} }
net_write(str_none, sizeof(str_none)); telnet_net_write(str_none, sizeof(str_none));
printsub('>', &str_none[2], sizeof(str_none) - 2); printsub('>', &str_none[2], sizeof(str_none) - 2);
if (auth_debug_mode) if (auth_debug_mode)
printf(">>>%s: Sent failure message\r\n", Name); printf(">>>%s: Sent failure message\r\n", Name);
@@ -564,7 +564,7 @@ auth_sendname(unsigned char *cp, int len)
} }
*e++ = IAC; *e++ = IAC;
*e++ = SE; *e++ = SE;
net_write(str_request, e - str_request); telnet_net_write(str_request, e - str_request);
printsub('>', &str_request[2], e - &str_request[2]); printsub('>', &str_request[2], e - &str_request[2]);
return(1); return(1);
} }

1
appl/telnet/libtelnet/enc-proto.h
View File

@@ -74,7 +74,6 @@ int EncryptStopInput(void);
int EncryptStopOutput(void); int EncryptStopOutput(void);
int EncryptType(char*, char*); int EncryptType(char*, char*);
int EncryptVerbose(int); int EncryptVerbose(int);
int net_write (unsigned char *, int);
void decrypt_auto(int); void decrypt_auto(int);
void encrypt_auto(int); void encrypt_auto(int);
void encrypt_debug(int); void encrypt_debug(int);

6
appl/telnet/libtelnet/enc_des.c
View File

@@ -235,7 +235,7 @@ static int fb64_start(struct fb *fbp, int dir, int server)
*p++ = IAC; *p++ = IAC;
*p++ = SE; *p++ = SE;
printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
net_write(fbp->fb_feed, p - fbp->fb_feed); telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
break; break;
default: default:
return(FAILED); return(FAILED);
@@ -293,7 +293,7 @@ int fb64_is(unsigned char *data, int cnt, struct fb *fbp)
*p++ = IAC; *p++ = IAC;
*p++ = SE; *p++ = SE;
printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
net_write(fbp->fb_feed, p - fbp->fb_feed); telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
state = fbp->state[DIR_DECRYPT-1] = IN_PROGRESS; state = fbp->state[DIR_DECRYPT-1] = IN_PROGRESS;
break; break;
@@ -318,7 +318,7 @@ int fb64_is(unsigned char *data, int cnt, struct fb *fbp)
*p++ = IAC; *p++ = IAC;
*p++ = SE; *p++ = SE;
printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]); printsub('>', &fbp->fb_feed[2], p - &fbp->fb_feed[2]);
net_write(fbp->fb_feed, p - fbp->fb_feed); telnet_net_write(fbp->fb_feed, p - fbp->fb_feed);
break; break;
} }

12
appl/telnet/libtelnet/encrypt.c
View File

@@ -436,7 +436,7 @@ encrypt_send_support(void)
*/ */
if (!Server && autodecrypt) if (!Server && autodecrypt)
encrypt_send_request_start(); encrypt_send_request_start();
net_write(str_send, str_suplen); telnet_net_write(str_send, str_suplen);
printsub('>', &str_send[2], str_suplen - 2); printsub('>', &str_send[2], str_suplen - 2);
str_suplen = 0; str_suplen = 0;
} }
@@ -798,7 +798,7 @@ void encrypt_send_keyid(int dir, unsigned char *keyid, int keylen, int saveit)
} }
*strp++ = IAC; *strp++ = IAC;
*strp++ = SE; *strp++ = SE;
net_write(str_keyid, strp - str_keyid); telnet_net_write(str_keyid, strp - str_keyid);
printsub('>', &str_keyid[2], strp - str_keyid - 2); printsub('>', &str_keyid[2], strp - str_keyid - 2);
} }
@@ -857,7 +857,7 @@ encrypt_start_output(int type)
} }
*p++ = IAC; *p++ = IAC;
*p++ = SE; *p++ = SE;
net_write(str_start, p - str_start); telnet_net_write(str_start, p - str_start);
net_encrypt(); net_encrypt();
printsub('>', &str_start[2], p - &str_start[2]); printsub('>', &str_start[2], p - &str_start[2]);
/* /*
@@ -883,7 +883,7 @@ encrypt_send_end(void)
return; return;
str_end[3] = ENCRYPT_END; str_end[3] = ENCRYPT_END;
net_write(str_end, sizeof(str_end)); telnet_net_write(str_end, sizeof(str_end));
net_encrypt(); net_encrypt();
printsub('>', &str_end[2], sizeof(str_end) - 2); printsub('>', &str_end[2], sizeof(str_end) - 2);
/* /*
@@ -911,7 +911,7 @@ encrypt_send_request_start(void)
} }
*p++ = IAC; *p++ = IAC;
*p++ = SE; *p++ = SE;
net_write(str_start, p - str_start); telnet_net_write(str_start, p - str_start);
printsub('>', &str_start[2], p - &str_start[2]); printsub('>', &str_start[2], p - &str_start[2]);
if (encrypt_debug_mode) if (encrypt_debug_mode)
printf(">>>%s: Request input to be encrypted\r\n", Name); printf(">>>%s: Request input to be encrypted\r\n", Name);
@@ -921,7 +921,7 @@ void
encrypt_send_request_end(void) encrypt_send_request_end(void)
{ {
str_end[3] = ENCRYPT_REQEND; str_end[3] = ENCRYPT_REQEND;
net_write(str_end, sizeof(str_end)); telnet_net_write(str_end, sizeof(str_end));
printsub('>', &str_end[2], sizeof(str_end) - 2); printsub('>', &str_end[2], sizeof(str_end) - 2);
if (encrypt_debug_mode) if (encrypt_debug_mode)

2
appl/telnet/libtelnet/kerberos.c
View File

@@ -139,7 +139,7 @@ Data(Authenticator *ap, int type, const void *d, int c)
*p++ = SE; *p++ = SE;
if (str_data[3] == TELQUAL_IS) if (str_data[3] == TELQUAL_IS)
printsub('>', &str_data[2], p - (&str_data[2])); printsub('>', &str_data[2], p - (&str_data[2]));
return(net_write(str_data, p - str_data)); return(telnet_net_write(str_data, p - str_data));
} }
int int

2
appl/telnet/libtelnet/kerberos5.c
View File

@@ -146,7 +146,7 @@ Data(Authenticator *ap, int type, void *d, int c)
*p++ = SE; *p++ = SE;
if (str_data[3] == TELQUAL_IS) if (str_data[3] == TELQUAL_IS)
printsub('>', &str_data[2], p - &str_data[2]); printsub('>', &str_data[2], p - &str_data[2]);
return(net_write(str_data, p - str_data)); return(telnet_net_write(str_data, p - str_data));
} }
int int

2
appl/telnet/libtelnet/krb4encpwd.c
View File

@@ -143,7 +143,7 @@ Data(ap, type, d, c)
*p++ = SE; *p++ = SE;
if (str_data[3] == TELQUAL_IS) if (str_data[3] == TELQUAL_IS)
printsub('>', &str_data[2], p - (&str_data[2])); printsub('>', &str_data[2], p - (&str_data[2]));
return(net_write(str_data, p - str_data)); return(telnet_net_write(str_data, p - str_data));
} }
int int

2
appl/telnet/libtelnet/misc-proto.h
View File

@@ -70,7 +70,7 @@ int Ambiguous(void *s);
/* /*
* These functions are imported from the application * These functions are imported from the application
*/ */
int net_write (unsigned char *, int); int telnet_net_write (unsigned char *, int);
void net_encrypt (void); void net_encrypt (void);
int telnet_spin (void); int telnet_spin (void);
char *telnet_getenv (char *); char *telnet_getenv (char *);

2
appl/telnet/libtelnet/rsaencpwd.c
View File

@@ -143,7 +143,7 @@ Data(ap, type, d, c)
*p++ = SE; *p++ = SE;
if (str_data[3] == TELQUAL_IS) if (str_data[3] == TELQUAL_IS)
printsub('>', &str_data[2], p - (&str_data[2])); printsub('>', &str_data[2], p - (&str_data[2]));
return(net_write(str_data, p - str_data)); return(telnet_net_write(str_data, p - str_data));
} }
int int

2
appl/telnet/libtelnet/spx.c
View File

@@ -160,7 +160,7 @@ Data(ap, type, d, c)
*p++ = SE; *p++ = SE;
if (str_data[3] == TELQUAL_IS) if (str_data[3] == TELQUAL_IS)
printsub('>', &str_data[2], p - (&str_data[2])); printsub('>', &str_data[2], p - (&str_data[2]));
return(net_write(str_data, p - str_data)); return(telnet_net_write(str_data, p - str_data));
} }
int int

2
appl/telnet/telnet/authenc.c
View File

@@ -37,7 +37,7 @@ RCSID("$Id$");
#if defined(AUTHENTICATION) || defined(ENCRYPTION) #if defined(AUTHENTICATION) || defined(ENCRYPTION)
int int
net_write(unsigned char *str, int len) telnet_net_write(unsigned char *str, int len)
{ {
if (NETROOM() > len) { if (NETROOM() > len) {
ring_supply_data(&netoring, str, len); ring_supply_data(&netoring, str, len);

2
appl/telnet/telnet/externs.h
View File

@@ -179,7 +179,7 @@ extern jmp_buf
/* authenc.c */ /* authenc.c */
#if defined(AUTHENTICATION) || defined(ENCRYPTION) #if defined(AUTHENTICATION) || defined(ENCRYPTION)
int net_write(unsigned char *str, int len); int telnet_net_write(unsigned char *str, int len);
void net_encrypt(void); void net_encrypt(void);
int telnet_spin(void); int telnet_spin(void);
char *telnet_getenv(char *val); char *telnet_getenv(char *val);

2
appl/telnet/telnetd/authenc.c
View File

@@ -38,7 +38,7 @@ RCSID("$Id$");
#ifdef AUTHENTICATION #ifdef AUTHENTICATION
int int
net_write(unsigned char *str, int len) telnet_net_write(unsigned char *str, int len)
{ {
if (nfrontp + len < netobuf + BUFSIZ) { if (nfrontp + len < netobuf + BUFSIZ) {
memmove(nfrontp, str, len); memmove(nfrontp, str, len);

2
appl/telnet/telnetd/ext.h
View File

@@ -75,7 +75,7 @@ extern int ourpty, net;
extern char *line; extern char *line;
extern int SYNCHing; /* we are in TELNET SYNCH mode */ extern int SYNCHing; /* we are in TELNET SYNCH mode */
int net_write (unsigned char *str, int len); int telnet_net_write (unsigned char *str, int len);
void net_encrypt (void); void net_encrypt (void);
int telnet_spin (void); int telnet_spin (void);
char *telnet_getenv (char *val); char *telnet_getenv (char *val);

12
appl/telnet/telnetd/telnetd.c
View File

@@ -537,33 +537,33 @@ getterminaltype(char *name, size_t name_sz)
static unsigned char sb[] = static unsigned char sb[] =
{ IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE }; { IAC, SB, TELOPT_TSPEED, TELQUAL_SEND, IAC, SE };
net_write (sb, sizeof sb); telnet_net_write (sb, sizeof sb);
DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
} }
if (his_state_is_will(TELOPT_XDISPLOC)) { if (his_state_is_will(TELOPT_XDISPLOC)) {
static unsigned char sb[] = static unsigned char sb[] =
{ IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE }; { IAC, SB, TELOPT_XDISPLOC, TELQUAL_SEND, IAC, SE };
net_write (sb, sizeof sb); telnet_net_write (sb, sizeof sb);
DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
} }
if (his_state_is_will(TELOPT_NEW_ENVIRON)) { if (his_state_is_will(TELOPT_NEW_ENVIRON)) {
static unsigned char sb[] = static unsigned char sb[] =
{ IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE }; { IAC, SB, TELOPT_NEW_ENVIRON, TELQUAL_SEND, IAC, SE };
net_write (sb, sizeof sb); telnet_net_write (sb, sizeof sb);
DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
} }
else if (his_state_is_will(TELOPT_OLD_ENVIRON)) { else if (his_state_is_will(TELOPT_OLD_ENVIRON)) {
static unsigned char sb[] = static unsigned char sb[] =
{ IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE }; { IAC, SB, TELOPT_OLD_ENVIRON, TELQUAL_SEND, IAC, SE };
net_write (sb, sizeof sb); telnet_net_write (sb, sizeof sb);
DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2);); DIAG(TD_OPTIONS, printsub('>', sb + 2, sizeof sb - 2););
} }
if (his_state_is_will(TELOPT_TTYPE)) { if (his_state_is_will(TELOPT_TTYPE)) {
net_write (ttytype_sbbuf, sizeof ttytype_sbbuf); telnet_net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2, DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
sizeof ttytype_sbbuf - 2);); sizeof ttytype_sbbuf - 2););
} }
@@ -638,7 +638,7 @@ _gettermname()
if (his_state_is_wont(TELOPT_TTYPE)) if (his_state_is_wont(TELOPT_TTYPE))
return; return;
settimer(baseline); settimer(baseline);
net_write (ttytype_sbbuf, sizeof ttytype_sbbuf); telnet_net_write (ttytype_sbbuf, sizeof ttytype_sbbuf);
DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2, DIAG(TD_OPTIONS, printsub('>', ttytype_sbbuf + 2,
sizeof ttytype_sbbuf - 2);); sizeof ttytype_sbbuf - 2););
while (sequenceIs(ttypesubopt, baseline)) while (sequenceIs(ttypesubopt, baseline))