From 6f85151d8705b22cea6695102c9bfd83dc7f00a9 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Wed, 15 Aug 2018 20:29:46 +0200 Subject: [PATCH] F #2150: Changes for oned.conf. Add client IP by default in oned.conf (cherry picked from commit 3d883cd487722e01ad79c7f222fc6421290fe608) --- share/etc/oned.conf | 6 +++--- src/nebula/NebulaTemplate.cc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/share/etc/oned.conf b/share/etc/oned.conf index feef3c7266..086b679255 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -246,8 +246,8 @@ DEFAULT_COST = [ # %g -- group id # %G -- group name # %a -- auth token -# %A -- Request IP address -# %P -- Request PORT +# %A -- client IP address (only IPv4 supported) +# %P -- client TCP port # %% -- % #******************************************************************************* @@ -258,7 +258,7 @@ DEFAULT_COST = [ #TIMEOUT = 15 #RPC_LOG = NO #MESSAGE_SIZE = 1073741824 -#LOG_CALL_FORMAT = "Req:%i UID:%u %m invoked %l20" +#LOG_CALL_FORMAT = "Req:%i UID:%u IP:%A %m invoked %l20" #******************************************************************************* # Physical Networks configuration diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc index 8351bcfadf..ce3ad67e95 100644 --- a/src/nebula/NebulaTemplate.cc +++ b/src/nebula/NebulaTemplate.cc @@ -500,7 +500,7 @@ void OpenNebulaTemplate::set_conf_default() set_conf_single("TIMEOUT", "15"); set_conf_single("RPC_LOG", "NO"); set_conf_single("MESSAGE_SIZE", "1073741824"); - set_conf_single("LOG_CALL_FORMAT", "Req:%i UID:%u %m invoked %l"); + set_conf_single("LOG_CALL_FORMAT", "Req:%i UID:%u IP:%A %m invoked %l"); /* #*******************************************************************************