equal
deleted
inserted
replaced
12 #define OUI_PROFINET 0x000ECF /* PROFIBUS Nutzerorganisation e.V. */ |
12 #define OUI_PROFINET 0x000ECF /* PROFIBUS Nutzerorganisation e.V. */ |
13 Index: epan/etypes.h |
13 Index: epan/etypes.h |
14 =================================================================== |
14 =================================================================== |
15 --- epan/etypes.h (revision 41973) |
15 --- epan/etypes.h (revision 41973) |
16 +++ epan/etypes.h (working copy) |
16 +++ epan/etypes.h (working copy) |
17 @@ -463,6 +463,10 @@ |
17 @@ -492,6 +492,10 @@ |
18 #define ETHERTYPE_TTE_PCF 0x891D /* TTEthernet Protocol Control Frame */ |
18 #define ETHERTYPE_HSR 0x892F /* High-availability Seamless Redundancy (IEC62439 Part 3) */ |
19 #endif |
19 #endif |
20 |
20 |
21 +#ifndef ETHERTYPE_ECP |
21 +#ifndef ETHERTYPE_ECP |
22 +#define ETHERTYPE_ECP 0x8940 /* Edge Control Protocol */ |
22 +#define ETHERTYPE_ECP 0x8940 /* Edge Control Protocol */ |
23 +#endif |
23 +#endif |
648 +} |
648 +} |
649 Index: epan/dissectors/Makefile.common |
649 Index: epan/dissectors/Makefile.common |
650 =================================================================== |
650 =================================================================== |
651 --- epan/dissectors/Makefile.common (revision 41973) |
651 --- epan/dissectors/Makefile.common (revision 41973) |
652 +++ epan/dissectors/Makefile.common (working copy) |
652 +++ epan/dissectors/Makefile.common (working copy) |
653 @@ -108,6 +108,7 @@ |
653 @@ -114,6 +114,7 @@ |
654 packet-dop.c \ |
654 packet-dop.c \ |
655 packet-dsp.c \ |
655 packet-dsp.c \ |
656 packet-ess.c \ |
656 packet-ess.c \ |
657 + packet-ecp.c \ |
657 + packet-ecp.c \ |
658 packet-ftam.c \ |
658 packet-ftam.c \ |
659 packet-goose.c \ |
659 packet-goose.c \ |
660 packet-h225.c \ |
660 packet-HI2Operations.c \ |