Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Matt Johnston
dropbear
Commits
a2f70a37
Commit
a2f70a37
authored
Apr 03, 2013
by
Matt Johnston
Browse files
Just put the version string on the queue, don't use atomicio
parent
286fa93a
Changes
2
Hide whitespace changes
Inline
Side-by-side
common-session.c
View file @
a2f70a37
...
...
@@ -33,7 +33,6 @@
#include "random.h"
#include "kex.h"
#include "channel.h"
#include "atomicio.h"
#include "runopts.h"
static
void
checktimeouts
();
...
...
@@ -50,8 +49,6 @@ int sessinitdone = 0; /* GLOBAL */
/* this is set when we get SIGINT or SIGTERM, the handler is in main.c */
int
exitflag
=
0
;
/* GLOBAL */
/* called only at the start of a session, set up initial state */
void
common_session_init
(
int
sock_in
,
int
sock_out
)
{
...
...
@@ -257,13 +254,12 @@ void session_cleanup() {
TRACE
((
"leave session_cleanup"
))
}
void
send_session_identification
()
{
/* write our version string, this blocks */
if
(
atomicio
(
write
,
ses
.
sock_out
,
LOCAL_IDENT
"
\r\n
"
,
strlen
(
LOCAL_IDENT
"
\r\n
"
))
==
DROPBEAR_FAILURE
)
{
ses
.
remoteclosed
(
);
}
buffer
*
writebuf
=
buf_new
(
strlen
(
LOCAL_IDENT
"
\r\n
"
)
+
1
);
buf_putbytes
(
writebuf
,
LOCAL_IDENT
"
\r\n
"
,
strlen
(
LOCAL_IDENT
"
\r\n
"
));
buf_putbyte
(
writebuf
,
0x0
);
// packet type
buf_setpos
(
writebuf
,
0
);
enqueue
(
&
ses
.
writequeue
,
writebuf
);
}
static
void
read_session_identification
()
{
...
...
process-packet.c
View file @
a2f70a37
...
...
@@ -48,7 +48,7 @@ void process_packet() {
TRACE2
((
"enter process_packet"
))
type
=
buf_getbyte
(
ses
.
payload
);
TRACE
((
"process_packet: packet type = %d
"
,
type
))
TRACE
((
"process_packet: packet type = %d
, len %d"
,
type
,
ses
.
payload
->
len
))
ses
.
lastpacket
=
type
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment