Browse Source

. fusedefs.h, fuseif.cpp, genfuse.cpp: fixed a bug that JSON_ATTR_IFNAME was

defined twice in both jsondef.h and fusedefs.h. The solution is to rename the
one in  fufsedefs.h to JSON_ATTR_IFNAME1.
pull/4/head
zhiming99 2 years ago
parent
commit
de1a817ed5
No known key found for this signature in database GPG Key ID: A7115AD3F27219B
3 changed files with 24 additions and 20 deletions
  1. +1
    -1
      fuse/fusedefs.h
  2. +14
    -10
      fuse/fuseif.cpp
  3. +9
    -9
      ridl/genfuse.cpp

+ 1
- 1
fuse/fusedefs.h View File

@ -29,7 +29,7 @@
// 'interface' and a string attributes 'method' to
// specify which interface and which method the
// parameters are for.
#define JSON_ATTR_IFNAME "Interface"
#define JSON_ATTR_IFNAME1 "Interface"
#define JSON_ATTR_METHOD "Method"
// A json message must have a string attribute MsgType


+ 14
- 10
fuse/fuseif.cpp View File

@ -32,6 +32,7 @@ using namespace rpcf;
#include <unistd.h>
#include <counters.h>
#include <regex>
#include "jsondef.h"
#define FUSE_MIN_FILES 2
@ -949,7 +950,7 @@ gint32 CFuseSvcStat::UpdateContent()
ret = oIfCfg.GetStrProp(
propObjName, strVal );
if( SUCCEEDED( ret ) )
oVal[ "ObjName" ] = strVal;
oVal[ JSON_ATTR_OBJNAME ] = strVal;
ret = oIfCfg.GetStrProp(
propObjPath, strVal );
@ -3967,17 +3968,20 @@ stdstr CFuseConnDir::DumpConnParams()
if( dwVal != 0 )
oVal[ "DestPortNum" ] = dwVal;
bVal = oConn.IsCompression();
oVal[ JSON_ATTR_ENABLE_COMPRESS ] = bVal;
bVal = oConn.IsWebSocket();
oVal[ "WebSocket" ] = bVal;
oVal[ JSON_ATTR_ENABLE_WEBSOCKET ] = bVal;
if( bVal )
oVal[ "URL" ] = oConn.GetUrl();
oVal[ JSON_ATTR_DEST_URL ] = oConn.GetUrl();
bVal = oConn.IsSSL();
oVal[ "SSL" ] = bVal;
oVal[ JSON_ATTR_ENABLE_SSL ] = bVal;
bVal = oConn.HasAuth();
oVal[ "Authentication" ] = bVal;
oVal[ JSON_ATTR_HASAUTH ] = bVal;
if( bVal )
{
@ -3996,26 +4000,26 @@ stdstr CFuseConnDir::DumpConnParams()
break;
Json::Value oAuthVal;
oAuthVal[ "mechanism" ] = strVal;
oAuthVal[ JSON_ATTR_AUTHMECH ] = strVal;
if( strVal != "krb5" )
break;
ret = oAuth.GetStrProp(
propUserName, strVal );
if( SUCCEEDED( ret ) )
oAuthVal[ "user" ] = strVal;
oAuthVal[ JSON_ATTR_USERNAME ] = strVal;
ret = oAuth.GetStrProp(
propRealm, strVal );
if( SUCCEEDED( ret ) )
oAuthVal[ "realm" ] = strVal;
oAuthVal[ JSON_ATTR_REALM ] = strVal;
ret = oAuth.GetBoolProp(
propSignMsg, bVal );
if( SUCCEEDED( ret ) )
oAuthVal[ "signmsg" ] = bVal;
oAuthVal[ JSON_ATTR_SIGN_MSG ] = bVal;
oVal[ "AuthInfo" ] = oAuthVal;
oVal[ JSON_ATTR_AUTHINFO ] = oAuthVal;
}
strRet = Json::writeString(


+ 9
- 9
ridl/genfuse.cpp View File

@ -70,7 +70,7 @@ gint32 EmitBuildJsonReq(
Wa( " oJsParams.isObject() )" );
Wa( " oJsReq[ JSON_ATTR_PARAMS ] = oJsParams;" );
Wa( "oJsReq[ JSON_ATTR_METHOD ] = strMethod;" );
Wa( "oJsReq[ JSON_ATTR_IFNAME ] = strIfName;" );
Wa( "oJsReq[ JSON_ATTR_IFNAME1 ] = strIfName;" );
Wa( "if( bProxy )" );
BLOCK_OPEN;
Wa( "if( bResp )" );
@ -2934,11 +2934,11 @@ gint32 CImplServiceImplFuse::Output()
Wa( "if( strType != \"resp\" &&" );
Wa( " strType != \"evt\" )" );
Wa( "{ ret = -EINVAL; break; }" );
Wa( "if( !oMsg.isMember( JSON_ATTR_IFNAME ) ||" );
Wa( " !oMsg[ JSON_ATTR_IFNAME ].isString() )" );
Wa( "if( !oMsg.isMember( JSON_ATTR_IFNAME1 ) ||" );
Wa( " !oMsg[ JSON_ATTR_IFNAME1 ].isString() )" );
Wa( "{ ret = -EINVAL; break; }" );
Wa( "stdstr strIfName =" );
Wa( " oMsg[ JSON_ATTR_IFNAME ].asString();" );
Wa( " oMsg[ JSON_ATTR_IFNAME1 ].asString();" );
std::vector< ObjPtr > vecIfRefs;
m_pNode->GetIfRefs( vecIfRefs );
for( auto& elem : vecIfRefs )
@ -3064,11 +3064,11 @@ gint32 CImplServiceImplFuse::Output()
Wa( "{ ret = -EINVAL; break; }" );
Wa( "stdstr strMethod =" );
Wa( " oReq[ JSON_ATTR_METHOD ].asString();" );
Wa( "if( !oReq.isMember( JSON_ATTR_IFNAME ) ||");
Wa( " !oReq[ JSON_ATTR_IFNAME ].isString() )" );
Wa( "if( !oReq.isMember( JSON_ATTR_IFNAME1 ) ||");
Wa( " !oReq[ JSON_ATTR_IFNAME1 ].isString() )" );
Wa( "{ ret = -EINVAL; break; }" );
Wa( "stdstr strIfName =" );
Wa( " oReq[ JSON_ATTR_IFNAME ].asString();" );
Wa( " oReq[ JSON_ATTR_IFNAME1 ].asString();" );
Wa( "if( !oReq.isMember( JSON_ATTR_MSGTYPE ) ||");
Wa( " !oReq[ JSON_ATTR_MSGTYPE ].isString() )" );
Wa( "{ ret = -EINVAL; break; }" );
@ -3084,7 +3084,7 @@ gint32 CImplServiceImplFuse::Output()
Wa( "// init the response value" );
Wa( "oResp[ JSON_ATTR_MSGTYPE ] = \"resp\";" );
Wa( "oResp[ JSON_ATTR_METHOD ] = strMethod;" );
Wa( "oResp[ JSON_ATTR_IFNAME ] = strIfName;" );
Wa( "oResp[ JSON_ATTR_IFNAME1 ] = strIfName;" );
Wa( "oResp[ JSON_ATTR_REQCTXID ] =" );
Wa( " ( Json::UInt64& )qwReqId;" );
Wa( "if( this->GetState() != stateConnected )" );
@ -3188,7 +3188,7 @@ gint32 CImplServiceImplFuse::Output()
Wa( "if( ERROR( ret ) )" );
Wa( " break;" );
Wa( "Json::Value oJsResp( objectValue );" );
Wa( "oJsResp[ JSON_ATTR_IFNAME ] =" );
Wa( "oJsResp[ JSON_ATTR_IFNAME1 ] =" );
Wa( " \"IInterfaceServer\";" );
Wa( "oJsResp[ JSON_ATTR_METHOD ] =" );
Wa( " \"UserCancelRequest\";" );


Loading…
Cancel
Save