From ef4ded0602a965d6df5099441d75e334c1452bb0 Mon Sep 17 00:00:00 2001
From: Comma Device <device@comma.ai>
Date: Thu, 14 Nov 2019 00:00:50 +0000
Subject: [PATCH] add conflate support in SubSocket constructor

---
 messaging/messaging.cc  | 7 +++++++
 messaging/messaging.hpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/messaging/messaging.cc b/messaging/messaging.cc
index 241bcbbc0b2895..61a078b15e4179 100644
--- a/messaging/messaging.cc
+++ b/messaging/messaging.cc
@@ -36,6 +36,13 @@ SubSocket * SubSocket::create(Context * context, std::string endpoint, std::stri
   return s;
 }
 
+SubSocket * SubSocket::create(Context * context, std::string endpoint, std::string address, bool conflate){
+  SubSocket *s = SubSocket::create();
+  s->connect(context, endpoint, address, conflate);
+
+  return s;
+}
+
 PubSocket * PubSocket::create(){
   PubSocket * s;
   if (std::getenv("ZMQ")){
diff --git a/messaging/messaging.hpp b/messaging/messaging.hpp
index 95e34c0d67f4dc..4a9eee315cd64f 100644
--- a/messaging/messaging.hpp
+++ b/messaging/messaging.hpp
@@ -30,6 +30,7 @@ class SubSocket {
   static SubSocket * create();
   static SubSocket * create(Context * context, std::string endpoint);
   static SubSocket * create(Context * context, std::string endpoint, std::string address);
+  static SubSocket * create(Context * context, std::string endpoint, std::string address, bool conflate);
   virtual ~SubSocket(){};
 };