Changeset 93c9aff


Ignore:
Timestamp:
01/29/16 11:17:35 (6 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
pfring
Children:
9e7c502
Parents:
a21b45e (diff), 206109f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/develop' into pfring

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_rt.c

    rd8b05b7 r93c9aff  
    159159                return -1;
    160160        }
     161
     162        if (ntohl(connect_msg.type) == TRACE_RT_HELLO) {
     163
     164                if (connect_msg.length != sizeof(rt_hello_t)) {
     165                        trace_set_err(libtrace,
     166                                        TRACE_ERR_INIT_FAILED,
     167                                        "RT version mismatch: we are version 3, server is >= 4");
     168                        return -1;
     169                }
     170        }
     171
     172        if (ntohl(connect_msg.type) == TRACE_RT_DENY_CONN) {
     173
     174                if (connect_msg.length != sizeof(rt_deny_conn_t)) {
     175                        trace_set_err(libtrace,
     176                                        TRACE_ERR_INIT_FAILED,
     177                                        "RT version mismatch: we are version 3, server is >= 4");
     178                        return -1;
     179                }
     180        }
     181
    161182       
    162183        if (connect_msg.magic != LIBTRACE_RT_MAGIC) {
Note: See TracChangeset for help on using the changeset viewer.