Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 126 insertions, 0 deletions

diff --git a/plugins/epan/mate/examples/call.mate b/plugins/epan/mate/examples/call.mate
new file mode 100644
index 00000000..0dbbb45e
--- /dev/null
+++ b/plugins/epan/mate/examples/call.mate
@@ -0,0 +1,34 @@
+# call.mate
+
+Action=Settings; DiscardPduData=TRUE; ShowGopTimes=FALSE; ShowPduTree=FALSE;
+
+Action=PduDef; Name=q931_pdu; Proto=q931; Stop=TRUE; Transport=tcp/ip; addr=ip.addr; call_ref=q931.call_ref; q931_msg=q931.message_type;
+Action=PduDef; Name=ras_pdu; Proto=h225.RasMessage; Transport=udp/ip; addr=ip.addr; ras_sn=h225.requestSeqNum; ras_msg=h225.RasMessage;
+Action=PduDef; Name=isup_pdu; Proto=isup; Transport=mtp3; m3pc=mtp3.dpc; m3pc=mtp3.opc; cic=isup.cic; isup_msg=isup.message_type;
+
+Action=PduExtra; For=q931_pdu; guid=h225.guid; calling=q931.calling_party_number.digits; q931_cause=q931.cause_value;
+Action=PduExtra; For=isup_pdu; calling=isup.calling; isup_cause=isup.cause_indicator;  
+Action=PduExtra; For=ras_pdu; guid=h225.guid;
+
+Action=GopDef; Name=q931_leg; On=q931_pdu; addr; addr; call_ref;
+Action=GopStart; For=q931_leg; q931_msg=5;
+Action=GopStop; For=q931_leg; q931_msg=90;
+Action=GopExtra; For=q931_leg; calling; q931_cause; guid;
+
+Action=GopDef; Name=isup_leg; On=isup_pdu; ShowPduTree=TRUE; ShowGopTimes=TRUE; m3pc; m3pc; cic;
+Action=GopStart; For=isup_leg; isup_msg=1;
+Action=GopStop; For=isup_leg; isup_msg=16;
+Action=GopExtra; For=isup_leg;  calling; isup_cause;
+
+Action=GopDef; Name=ras_leg; On=ras_pdu; addr; addr; ras_sn;
+Action=GopStart; For=ras_leg; ras_msg|0|3|6|9|12|15|18|21|26|30;
+Action=GopStop; For=ras_leg; ras_msg|1|2|4|5|7|8|10|11|13|14|16|17|19|20|22|24|27|28|29|31;
+Action=GopExtra; For=ras_leg; guid;
+
+Action=GogDef; Name=call; GogExpiration=0.75;
+Action=GogKey; For=call; On=isup_leg; calling;
+Action=GogKey; For=call; On=q931_leg; calling;
+Action=GogKey; For=call; On=q931_leg; guid;
+Action=GogKey; For=call; On=ras_leg; guid;
+Action=GogExtra; For=call; isup_cause;
+Action=GogExtra; For=call; q931_cause;
diff --git a/plugins/epan/mate/examples/mms.mate b/plugins/epan/mate/examples/mms.mate
new file mode 100644
index 00000000..7554b119
--- /dev/null
+++ b/plugins/epan/mate/examples/mms.mate
@@ -0,0 +1,40 @@
+# mms.mate
+
+# MMSE over HTTP
+Action=PduDef;   Name=mmse_over_http_pdu; Proto=http; Transport=tcp/ip; Payload=mmse; addr=ip.addr; port=tcp.port; http_rq=http.request; content=http.content_type;
+Action=PduExtra; For=mmse_over_http_pdu;  resp=http.response.code; method=http.request.method; host=http.host; content=http.content_type; 
+Action=PduExtra; For=mmse_over_http_pdu;  method=http.request.method; host=http.host; 
+Action=PduExtra; For=mmse_over_http_pdu;  trx=mmse.transaction_id; msg_type=mmse.message_type; notify_status=mmse.status; send_status=mmse.response_status;
+
+Action=Transform; Name=rm_client_from_http_resp1; Mode=Insert; Match=Strict; http_rq;
+Action=Transform; Name=rm_client_from_http_resp1; Mode=Insert; Match=Every; addr; .not_rq;
+
+Action=Transform; Name=rm_client_from_http_resp2; Mode=Replace; Match=Strict; not_rq; ue;
+
+Action=PduTransform; For=mmse_over_http_pdu; Name=rm_client_from_http_resp1;
+Action=PduTransform; For=mmse_over_http_pdu; Name=rm_client_from_http_resp2;
+
+Action=GopDef; Name=mmse_over_http; On=mmse_over_http_pdu; addr; addr; port; port;
+Action=GopStart; For=mmse_over_http; http_rq;
+Action=GopStop; For=mmse_over_http; http_rs;
+
+Action=GopExtra; For=mmse_over_http; host; ue; resp; notify_status; send_status; trx;
+
+# MMSE over WSP
+Action=PduDef; Name=mmse_over_wsp_pdu; Proto=wsp; Payload=mmse; Transport=ip; trx=mmse.transaction_id; msg_type=mmse.message_type; notify_status=mmse.status; send_status=mmse.response_status;
+
+Action=Transform; Name=mms_start; Match=Loose; .mms_start;
+
+Action=PduTransform;  Name=mms_start; For=mmse_over_wsp_pdu;
+
+Action=GopDef; Name=mmse_over_wsp; On=mmse_over_wsp_pdu; trx;
+Action=GopStart; For=mmse_over_wsp; mms_start; 
+Action=GopStop; For=mmse_over_wsp; never;
+
+Action=GopExtra; For=mmse_over_wsp; ue; notify_status; send_status;
+
+# the MMS GoG
+Action=GogDef; Name=mms; GogExpiration=60.0;
+Action=GogKey; For=mms; On=mmse_over_http; trx;
+Action=GogKey; For=mms; On=mmse_over_wsp; trx;
+Action=GogExtra; For=mms; ue; notify_status; send_status; resp; host; trx;
diff --git a/plugins/epan/mate/examples/pasv_ftp.mate b/plugins/epan/mate/examples/pasv_ftp.mate
new file mode 100644
index 00000000..24ef7ab4
--- /dev/null
+++ b/plugins/epan/mate/examples/pasv_ftp.mate
@@ -0,0 +1,18 @@
+# pasv_ftp.mate
+
+Action=PduDef; Name=ftp_pdu; Proto=ftp; Transport=tcp/ip; Stop=TRUE; ftp_addr=ip.addr; ftp_port=tcp.port; ftp_resp=ftp.response.code; ftp_req=ftp.request.command; server_addr=ftp.passive.ip; server_port=ftp.passive.port;
+
+Action=PduDef; Name=ftp_data_pdu; Proto=ftp-data; Transport=tcp/ip; server_addr=ip.src; server_port=tcp.srcport; 
+
+Action=GopDef; Name=ftp_data; On=ftp_data_pdu; server_addr; server_port;
+Action=GopStart; For=ftp_data; server_addr;
+
+Action=GopDef; Name=ftp_ctl; On=ftp_pdu; ftp_addr; ftp_addr; ftp_port; ftp_port;
+Action=GopStart; For=ftp_ctl; ftp_resp=220;
+Action=GopStop; For=ftp_ctl; ftp_resp=221;
+Action=GopExtra; For=ftp_ctl; server_addr; server_port;
+
+Action=GogDef; Name=ftp_ses;
+Action=GogKey; For=ftp_ses; On=ftp_ctl; ftp_addr; ftp_addr; ftp_port; ftp_port;
+Action=GogKey; For=ftp_ses; On=ftp_data; server_addr; server_port;
+
diff --git a/plugins/epan/mate/examples/tcp.mate b/plugins/epan/mate/examples/tcp.mate
new file mode 100644
index 00000000..2abe3e88
--- /dev/null
+++ b/plugins/epan/mate/examples/tcp.mate
@@ -0,0 +1,7 @@
+# tcp.mate
+
+   Action=PduDef; Name=tcp_pdu; Proto=tcp; Transport=ip; addr=ip.addr; port=tcp.port; tcp_start=tcp.flags.syn; tcp_stop=tcp.flags.fin; tcp_stop=tcp.flags.reset;
+   Action=GopDef; Name=tcp_session; On=tcp_pdu; addr; addr; port; port;
+   Action=GopStart; For=tcp_session; tcp_start=1;
+   Action=GopStop; For=tcp_session; tcp_stop=1;
+
diff --git a/plugins/epan/mate/examples/web.mate b/plugins/epan/mate/examples/web.mate
new file mode 100644
index 00000000..fd00c651
--- /dev/null
+++ b/plugins/epan/mate/examples/web.mate
@@ -0,0 +1,27 @@
+# web.mate
+
+Action=PduDef; Name=dns_pdu; Proto=dns; Transport=ip; addr=ip.addr; dns_resp=dns.flags.response; host=dns.qry.name; client_addr=ip.src; dns_id=dns.id; 
+Action=PduDef; Name=http_pdu; Proto=http; Transport=tcp/ip; addr=ip.addr; port=tcp.port; http_rq=http.request.method; http_rs=http.response; host=http.host; client_addr=ip.src;
+
+Action=GopDef; Name=dns_req; On=dns_pdu; addr; addr; dns_id;
+Action=GopStart; For=dns_req; dns_resp=0;
+Action=GopStop; For=dns_req; dns_resp=1;
+
+Action=GopDef; Name=http_req; On=http_pdu; addr; addr; port; port;
+Action=GopStart; For=http_req; http_rq;
+Action=GopStop; For=http_req; http_rs;
+
+Action=Transform; Name=rm_client_from_dns_resp; Mode=Replace; Match=Every; dns_resp=1; client_addr; .dns_resp=1;
+Action=PduTransform; For=dns_pdu; Name=rm_client_from_dns_resp;
+
+Action=Transform; Name=rm_client_from_http_resp; Mode=Replace; Match=Every; http_rs; client_addr; .http_rs=;
+Action=PduTransform; For=http_pdu; Name=rm_client_from_http_resp;
+
+Action=GopExtra; For=http_req; host; client_addr;
+Action=GopExtra; For=dns_req; host; client_addr;
+
+Action=GogDef; Name=http_use; GogExpiration=0.75;
+Action=GogKey; For=http_use; On=http_req; host; client_addr;
+Action=GogKey; For=http_use; On=dns_req; host;client_addr; 
+
+Action=GogExtra; For=http_use; host; client_addr;