1357f495ac
Common ------ - Change in OstProto - Individual protocols are now extensions of (new) message 'Protocol' instead of 'Stream' - Stream now contains a repeated Protocol which also determines the ordered set of currently selected protocols; StreamCore.frame_proto which was doing this earlier has been removed - Change in AbstractProtocol Interface - Parent changed to StreamBase - Corresponding change in constructor and factory func - createInstance() - new method protocolNumber() - returns unique id for each protocol - protoDataCopyInto/From() now copies into OstProto::Protocol instead of OstProto::Stream - Change in all subclasses of AbstractProtocol to match new interface - For all protocols, configFrom is no longer static, but each protocol has its own configForm - configForm creation is lazy - configForm is still a child of the protocol i.e. it will be destroyed alongwith the protocol - TODO: convert configWidget() to a pure factory function i.e. the protocol does not own the configForm - this requires us to pass the widget into load/storeConfigWidget() methods - ProtocolCollection class removed alongwith its .h and .cpp - ProtocolList class redefined to serve the purpose of ProtocolCollection - New class ProtocolListIterator defined to iterate ProtocolList - AbstractProtocol methods now use the ProtocolListIterator - Factory function createProtocol() added to ProtocolManager - OstProto::StreamCore accessor functions moved from Stream to StreamBase Server ------ - MyService uses the newly moved accessors to StreamBase for OstProto::StreamCore members - StreamInfo now uses the protocols to create the packet Client ------ - StreamConfigDialog now uses ProtocolListIterator - So does PacketModel
48 lines
1.2 KiB
Protocol Buffer
48 lines
1.2 KiB
Protocol Buffer
import "protocol.proto";
|
|
|
|
package OstProto;
|
|
// IPv4
|
|
message Ip4 {
|
|
|
|
enum IpAddrMode {
|
|
e_im_fixed = 0;
|
|
e_im_inc_host = 1;
|
|
e_im_dec_host = 2;
|
|
e_im_random_host = 3;
|
|
}
|
|
|
|
optional bool is_override_ver = 1;
|
|
optional bool is_override_hdrlen = 2;
|
|
optional bool is_override_totlen = 3;
|
|
optional bool is_override_cksum = 4;
|
|
|
|
optional uint32 ver_hdrlen = 5 [default = 0x45];
|
|
optional uint32 tos = 6;
|
|
optional uint32 totlen = 7;
|
|
optional uint32 id = 8 [default = 1234];
|
|
// TODO: rename flags to frag_flags
|
|
optional uint32 flags = 9;
|
|
optional uint32 frag_ofs = 10;
|
|
optional uint32 ttl = 11 [default = 127];
|
|
optional uint32 proto = 12;
|
|
optional uint32 cksum = 13;
|
|
|
|
// Source IP
|
|
optional fixed32 src_ip = 14;
|
|
optional IpAddrMode src_ip_mode = 15 [default = e_im_fixed];
|
|
optional uint32 src_ip_count = 16 [default = 16];
|
|
optional fixed32 src_ip_mask = 17 [default = 0xFFFFFFFF];
|
|
|
|
// Destination IP
|
|
optional fixed32 dst_ip = 18;
|
|
optional IpAddrMode dst_ip_mode = 19 [default = e_im_fixed];
|
|
optional uint32 dst_ip_count = 20 [default = 16];
|
|
optional fixed32 dst_ip_mask = 21 [default = 0xFFFFFFFF];
|
|
|
|
// TODO: Options
|
|
}
|
|
|
|
extend Protocol {
|
|
optional Ip4 ip4 = 130;
|
|
}
|