From 77ad1651dc89c22c724c8ce5d2834d579a7d104a Mon Sep 17 00:00:00 2001 From: Jaehong Jo Date: Fri, 12 Aug 2016 08:15:02 +0900 Subject: [PATCH] Remove '/.well-known' from URI According to a OCF spec Change-Id: I54167589ba4fc03282944ecf4ba06e24d83b1de7 Signed-off-by: Jaehong Jo Reviewed-on: https://gerrit.iotivity.org/gerrit/10309 Tested-by: jenkins-iotivity Reviewed-by: Hyuna Jo Reviewed-by: Jee Hyeok Kim --- resource/csdk/stack/include/octypes.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/resource/csdk/stack/include/octypes.h b/resource/csdk/stack/include/octypes.h index c31affd..7432863 100644 --- a/resource/csdk/stack/include/octypes.h +++ b/resource/csdk/stack/include/octypes.h @@ -69,20 +69,16 @@ extern "C" { #define OC_RSRVD_GATEWAY_URI "/oic/gateway" #endif -#ifdef WITH_MQ /** MQ Broker URI.*/ -#define OC_RSRVD_WELL_KNOWN_MQ_URI "/.well-known/ocf/ps" -#endif +#define OC_RSRVD_WELL_KNOWN_MQ_URI "/ocf/ps" #ifdef WITH_PRESENCE /** Presence URI through which the OIC devices advertise their presence.*/ #define OC_RSRVD_PRESENCE_URI "/oic/ad" -#ifdef WITH_CLOUD /** Presence URI through which the OCF devices advertise their device presence.*/ -#define OCF_RSRVD_DEVICE_PRESENCE_URI "/.well-known/ocf/prs" -#endif +#define OCF_RSRVD_DEVICE_PRESENCE_URI "/ocf/prs" /** Sets the default time to live (TTL) for presence.*/ #define OC_DEFAULT_PRESENCE_TTL_SECONDS (60) @@ -363,13 +359,13 @@ extern "C" { /** Cloud Account */ /** Account URI.*/ -#define OC_RSRVD_ACCOUNT_URI "/.well-known/ocf/account" +#define OC_RSRVD_ACCOUNT_URI "/ocf/account" /** Account session URI.*/ -#define OC_RSRVD_ACCOUNT_SESSION_URI "/.well-known/ocf/account/session" +#define OC_RSRVD_ACCOUNT_SESSION_URI "/ocf/account/session" /** Account token refresh URI.*/ -#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/.well-known/ocf/account/tokenrefresh" +#define OC_RSRVD_ACCOUNT_TOKEN_REFRESH_URI "/ocf/account/tokenrefresh" /** Defines auth provider. */ #define OC_RSRVD_AUTHPROVIDER "authprovider" -- 2.7.4