diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | packet.c | 16 | ||||
-rw-r--r-- | packet.h | 4 |
3 files changed, 24 insertions, 2 deletions
@@ -75,6 +75,12 @@ | |||
75 | [packet.h packet.c] | 75 | [packet.h packet.c] |
76 | Add packet_put_int64() and packet_get_int64(), part of a larger change | 76 | Add packet_put_int64() and packet_get_int64(), part of a larger change |
77 | from Martin Forssen. | 77 | from Martin Forssen. |
78 | ok markus@ | ||
79 | - andreas@cvs.openbsd.org 2009/05/27 06:38:16 | ||
80 | [sshconnect.h sshconnect.c] | ||
81 | Un-static ssh_exchange_identification(), part of a larger change from | ||
82 | Martin Forssen and needed for upcoming changes. | ||
83 | ok markus@ | ||
78 | 84 | ||
79 | 20090616 | 85 | 20090616 |
80 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t | 86 | - (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.161 2009/05/25 06:48:01 andreas Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.162 2009/05/27 06:36:07 andreas Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -596,6 +596,12 @@ packet_put_int(u_int value) | |||
596 | } | 596 | } |
597 | 597 | ||
598 | void | 598 | void |
599 | packet_put_int64(u_int64_t value) | ||
600 | { | ||
601 | buffer_put_int64(&active_state->outgoing_packet, value); | ||
602 | } | ||
603 | |||
604 | void | ||
599 | packet_put_string(const void *buf, u_int len) | 605 | packet_put_string(const void *buf, u_int len) |
600 | { | 606 | { |
601 | buffer_put_string(&active_state->outgoing_packet, buf, len); | 607 | buffer_put_string(&active_state->outgoing_packet, buf, len); |
@@ -1467,6 +1473,14 @@ packet_get_int(void) | |||
1467 | return buffer_get_int(&active_state->incoming_packet); | 1473 | return buffer_get_int(&active_state->incoming_packet); |
1468 | } | 1474 | } |
1469 | 1475 | ||
1476 | /* Returns an 64 bit integer from the packet data. */ | ||
1477 | |||
1478 | u_int64_t | ||
1479 | packet_get_int64(void) | ||
1480 | { | ||
1481 | return buffer_get_int64(&active_state->incoming_packet); | ||
1482 | } | ||
1483 | |||
1470 | /* | 1484 | /* |
1471 | * Returns an arbitrary precision integer from the packet data. The integer | 1485 | * Returns an arbitrary precision integer from the packet data. The integer |
1472 | * must have been initialized before this call. | 1486 | * must have been initialized before this call. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.h,v 1.50 2009/05/25 06:48:01 andreas Exp $ */ | 1 | /* $OpenBSD: packet.h,v 1.51 2009/05/27 06:36:07 andreas Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -39,6 +39,7 @@ void packet_set_authenticated(void); | |||
39 | void packet_start(u_char); | 39 | void packet_start(u_char); |
40 | void packet_put_char(int ch); | 40 | void packet_put_char(int ch); |
41 | void packet_put_int(u_int value); | 41 | void packet_put_int(u_int value); |
42 | void packet_put_int64(u_int64_t value); | ||
42 | void packet_put_bignum(BIGNUM * value); | 43 | void packet_put_bignum(BIGNUM * value); |
43 | void packet_put_bignum2(BIGNUM * value); | 44 | void packet_put_bignum2(BIGNUM * value); |
44 | void packet_put_string(const void *buf, u_int len); | 45 | void packet_put_string(const void *buf, u_int len); |
@@ -55,6 +56,7 @@ int packet_read_poll_seqnr(u_int32_t *seqnr_p); | |||
55 | 56 | ||
56 | u_int packet_get_char(void); | 57 | u_int packet_get_char(void); |
57 | u_int packet_get_int(void); | 58 | u_int packet_get_int(void); |
59 | u_int64_t packet_get_int64(void); | ||
58 | void packet_get_bignum(BIGNUM * value); | 60 | void packet_get_bignum(BIGNUM * value); |
59 | void packet_get_bignum2(BIGNUM * value); | 61 | void packet_get_bignum2(BIGNUM * value); |
60 | void *packet_get_raw(u_int *length_ptr); | 62 | void *packet_get_raw(u_int *length_ptr); |