[1924] Use the constants in default parameters too

diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index 1e71656b7598885e9d4f19ed12d140be85436b93..79b75412800532d76e9bb0e68dfe9f6e2cab7e36 100644 (file)
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -33,8 +33,6 @@
 #include <cc/data.h>
 #include <cc/session.h>
 
-#include <util/common_defs.h>
-
 #include <cstdio>
 #include <vector>
 #include <iostream>

diff --git a/src/lib/cc/session.h b/src/lib/cc/session.h
index e0ece567c2a371e80d35d5a4b8a8d5a40139322a..de01c09397adfb151c6779b8cff04ce1f9ce091a 100644 (file)
--- a/src/lib/cc/session.h
+++ b/src/lib/cc/session.h
@@ -15,14 +15,16 @@
 #ifndef ISC_SESSION_H
 #define ISC_SESSION_H 1
 
-#include <string>
+#include <cc/data.h>
+#include <cc/session_config.h>
 
-#include <boost/function.hpp>
+#include <util/common_defs.h>
 
 #include <exceptions/exceptions.h>
 
-#include <cc/data.h>
-#include <cc/session_config.h>
+#include <string>
+
+#include <boost/function.hpp>
 
 namespace asio {
 class io_service;
@@ -81,8 +83,10 @@ namespace isc {
             virtual void disconnect() = 0;
             virtual int group_sendmsg(isc::data::ConstElementPtr msg,
                                       std::string group,
-                                      std::string instance = "*",
-                                      std::string to = "*",
+                                      std::string instance =
+                                          isc::util::CC_INSTANCE_WILDCARD,
+                                      std::string to =
+                                          isc::util::CC_TO_WILDCARD,
                                       bool want_answer = false) = 0;
             virtual bool group_recvmsg(isc::data::ConstElementPtr& envelope,
                                        isc::data::ConstElementPtr& msg,

diff --git a/src/lib/python/isc/cc/session.py b/src/lib/python/isc/cc/session.py
index 8ea7fca8cc73caffe783e82f981f404934d1974f..cfc54d9cb61ac10fd4608af78e30eff9f2a0bcb1 100644 (file)
--- a/src/lib/python/isc/cc/session.py
+++ b/src/lib/python/isc/cc/session.py
@@ -257,8 +257,8 @@ class Session:
             "instance": instance,
         })
 
-    def group_sendmsg(self, msg, group, instance = "*", to = "*",
-                      want_answer=False):
+    def group_sendmsg(self, msg, group, instance=CC_INSTANCE_WILDCARD,
+                      to=CC_TO_WILDCARD, want_answer=False):
         seq = self._next_sequence()
         self.sendmsg({
             CC_HEADER_TYPE: CC_COMMAND_SEND,