From 4506c099eadd15f8189384bb0f1e24e18b441116 Mon Sep 17 00:00:00 2001
From: patrik <patrik@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 2 Jan 2012 16:19:50 +0000
Subject: [PATCH] o Added two new probes for the Basho Riak PBC and Tarantool
 protocols.   [Patrik]

---
 CHANGELOG           |  3 +++
 nmap-service-probes | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index a426f8b7d..80520a1ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Added two new probes for the Basho Riak PBC and Tarantool protocols.
+  [Patrik] 
+
 o [NSE] Added a natpmp library and the script nat-pmp-mapport that allows
   NAT mapping of external TCP and UDP ports to internal addresses. [Patrik]
 
diff --git a/nmap-service-probes b/nmap-service-probes
index 5e1f52f13..729f0ebab 100644
--- a/nmap-service-probes
+++ b/nmap-service-probes
@@ -10170,3 +10170,17 @@ Probe UDP memcached q|\0\x01\0\0\0\x01\0\0stats\r\n|
 rarity 8
 ports 11211
 match memcached m|^\0\x01\0\0\0\x01\0\0STAT pid \d+\r\nSTAT uptime \d+\r\nSTAT time \d+\r\nSTAT version ([.\d]+)\r\n|s p/Memcached/ v/$1/
+
+##############################NEXT PROBE##############################
+# Sends a ServerInfo PBC request to the Basho Riak distributed database
+Probe TCP riak-pbc q|\0\0\0\x01\x07|
+rarity 8
+ports 8087
+match riak-pbc m|^....\x08..(riak@[.\d]*)..([.\d]+)$|s p/Basho Riak/ v/$2/ i/Node name: $1/
+
+##############################NEXT PROBE##############################
+# Sends a ServerInfo PBC request to the Basho Riak distributed database
+Probe TCP tarantool q|show info\r\n|
+rarity 8
+ports 33015
+match tarantool m|---\r\ninfo:\r\n  version: \"([^\"]*)\"\r\n  uptime: (\d*)\r\n  pid: (\d*)\r\n  ([._\w\s]*: .*\r\n)*  config: \"([^\"]*)\"| p/Tarantool/ v/$1/ i/Uptime: $2, PID: $3, Config: $5/
\ No newline at end of file