diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2020-04-13 22:48:28 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 22:48:28 -0300 |
| commit | 1b0f1cb4d7ca196db89f14cd23d794c02f234cd6 (patch) | |
| tree | 4f9c1b1422f345afacaf0e2ff9d9eaef2e19efe4 /lib/stream.h | |
| parent | 4b010cf44dd90ad7f33243f3e800812184940ca3 (diff) | |
| parent | cff0de128d10f1f78144c8c0ca2d2251099d0241 (diff) | |
Merge pull request #5892 from qlyoung/fix-zclient-many
assorted lib / zclient fixes
Diffstat (limited to 'lib/stream.h')
| -rw-r--r-- | lib/stream.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/lib/stream.h b/lib/stream.h index 6fcf9a53cf..5c7d94fab8 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -215,6 +215,7 @@ extern bool stream_getl2(struct stream *s, uint32_t *l); extern uint32_t stream_getl_from(struct stream *, size_t); extern uint64_t stream_getq(struct stream *); extern uint64_t stream_getq_from(struct stream *, size_t); +bool stream_getq2(struct stream *s, uint64_t *q); extern uint32_t stream_get_ipv4(struct stream *); /* IEEE-754 floats */ @@ -402,6 +403,25 @@ static inline const uint8_t *ptr_get_be32(const uint8_t *ptr, uint32_t *out) (P) = _pval; \ } while (0) +#define STREAM_GETF(S, P) \ + do { \ + union { \ + float r; \ + uint32_t d; \ + } _pval; \ + if (stream_getl2((S), &_pval.d)) \ + goto stream_failure; \ + (P) = _pval.r; \ + } while (0) + +#define STREAM_GETQ(S, P) \ + do { \ + uint64_t _pval; \ + if (!stream_getq2((S), &_pval)) \ + goto stream_failure; \ + (P) = _pval; \ + } while (0) + #define STREAM_GET(P, STR, SIZE) \ do { \ if (!stream_get2((P), (STR), (SIZE))) \ |