Remove WITH_CHPROXY flag for build cleanup

To minimize feature specific build flags,
removed proxy flag from base layer.

Change-Id: Ic3498e181209b31aa7d531f1eb6f86a2fc92ba54
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/11937
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index afcfe76..5e90b80 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -84,9 +84,6 @@ if liboctbstack_env.get('ROUTING') == 'GW':
 elif liboctbstack_env.get('ROUTING') == 'EP':
        liboctbstack_env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 
-if liboctbstack_env.get('WITH_PROXY'):
-       liboctbstack_env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
-
 if target_os not in ['windows']:
        liboctbstack_env.AppendUnique(CFLAGS = ['-Wall'])
 

diff --git a/resource/csdk/connectivity/api/cainterface.h b/resource/csdk/connectivity/api/cainterface.h
index 1c2bbfa..1b45698 100644 (file)
--- a/resource/csdk/connectivity/api/cainterface.h
+++ b/resource/csdk/connectivity/api/cainterface.h
@@ -231,7 +231,6 @@ CAResult_t CAHandleRequestResponse();
 CAResult_t CASetRAInfo(const CARAInfo_t *caraInfo);
 #endif
 
-#ifdef WITH_CHPROXY
 /**
  * This function sets uri being used for proxy.
  *
@@ -240,7 +239,6 @@ CAResult_t CASetRAInfo(const CARAInfo_t *caraInfo);
  * @return  ::CA_STATUS_OK or ::CA_STATUS_INVALID_PARAM
  */
 CAResult_t CASetProxyUri(const char *uri);
-#endif
 
 #ifdef __cplusplus
 } /* extern "C" */

diff --git a/resource/csdk/connectivity/src/SConscript b/resource/csdk/connectivity/src/SConscript
index 77e96f2..729e7cf 100644 (file)
--- a/resource/csdk/connectivity/src/SConscript
+++ b/resource/csdk/connectivity/src/SConscript
@@ -106,9 +106,6 @@ if env.get('ROUTING') == 'GW':
 elif env.get('ROUTING') == 'EP':
        env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 
-if env.get('WITH_PROXY'):
-       env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
-
 if ca_os == 'arduino':
        env.AppendUnique(CPPDEFINES = ['SINGLE_THREAD'])
        env.AppendUnique(CPPDEFINES = ['WITH_ARDUINO'])

diff --git a/resource/csdk/connectivity/src/caprotocolmessage.c b/resource/csdk/connectivity/src/caprotocolmessage.c
index 96cfbb7..ae10ab2 100644 (file)
--- a/resource/csdk/connectivity/src/caprotocolmessage.c
+++ b/resource/csdk/connectivity/src/caprotocolmessage.c
@@ -51,7 +51,6 @@
 
 static const char COAP_URI_HEADER[] = "coap://[::]/";
 
-#ifdef WITH_CHPROXY
 static char g_chproxyUri[CA_MAX_URI_LENGTH];
 
 CAResult_t CASetProxyUri(const char *uri)
@@ -60,7 +59,6 @@ CAResult_t CASetProxyUri(const char *uri)
     OICStrcpy(g_chproxyUri, sizeof (g_chproxyUri), uri);
     return CA_STATUS_OK;
 }
-#endif
 
 CAResult_t CAGetRequestInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
                                    CARequestInfo_t *outReqInfo)
@@ -760,9 +758,7 @@ CAResult_t CAGetInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
     uint32_t optionLength = 0;
     bool isfirstsetflag = false;
     bool isQueryBeingProcessed = false;
-#ifdef WITH_CHPROXY
     bool isProxyRequest = false;
-#endif
 
     while ((option = coap_option_next(&opt_iter)))
     {
@@ -890,12 +886,10 @@ CAResult_t CAGetInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
             }
             else
             {
-#ifdef WITH_CHPROXY
                 if (COAP_OPTION_PROXY_URI == opt_iter.type)
                 {
                     isProxyRequest = true;
                 }
-#endif
                 if (idx < count)
                 {
                     if (bufLength <= sizeof(outInfo->options[0].optionData))
@@ -961,11 +955,10 @@ CAResult_t CAGetInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
             return CA_MEMORY_ALLOC_FAILED;
         }
     }
-#ifdef WITH_CHPROXY
     else if(isProxyRequest && g_chproxyUri[0] != '\0')
     {
        /*
-        *   A request for CoAP-HTTP Proxy will not have any uri element as per CoAP specs
+        *   A request for Proxy will not have any uri element as per CoAP specs
         *   and only COAP_OPTION_PROXY_URI will be present. Use preset proxy uri
         *   for such requests.
         */
@@ -978,7 +971,6 @@ CAResult_t CAGetInfoFromPDU(const coap_pdu_t *pdu, const CAEndpoint_t *endpoint,
             return CA_MEMORY_ALLOC_FAILED;
         }
     }
-#endif
     return CA_STATUS_OK;
 
 exit:

diff --git a/resource/csdk/stack/include/ocstack.h b/resource/csdk/stack/include/ocstack.h
index ad06006..ce06117 100644 (file)
--- a/resource/csdk/stack/include/ocstack.h
+++ b/resource/csdk/stack/include/ocstack.h
@@ -558,14 +558,12 @@ const OCDPDev_t* OCGetDirectPairedDevices();
 OCStackResult OCDoDirectPairing(void *ctx, OCDPDev_t* peer, OCPrm_t pmSel, char *pinNumber,
                                 OCDirectPairingCB resultCallback);
 
-#ifdef WITH_CHPROXY
 /**
  * This function sets uri being used for proxy.
  *
  * @param uri            NULL terminated resource uri for CoAP-HTTP Proxy.
  */
 OCStackResult OCSetProxyURI(const char *uri);
-#endif
 
 #if defined(RD_CLIENT) || defined(RD_SERVER)
 /**

diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript
index 532eb20..c368c47 100644 (file)
--- a/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript
+++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/SConscript
@@ -178,8 +178,6 @@ if env.get('ROUTING') == 'GW':
 elif env.get('ROUTING') == 'EP':
        env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
-if env.get('WITH_PROXY'):
-       env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
 
 Export('env')
 

diff --git a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
index 9ec20c5..5237143 100644 (file)
--- a/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
+++ b/resource/csdk/stack/samples/tizen/SimpleClientServer/scons/SConscript
@@ -37,9 +37,6 @@ if routing == 'GW':
 elif routing == 'EP':
        env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 
-if env.get('WITH_PROXY'):
-       env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
-       
 env.Append(LIBS=[
   'm', 'pthread', 'rt', 'dl', 'stdc++', 'gobject-2.0', 'gio-2.0', 'glib-2.0', 'capi-network-wifi', 'dlog', 'capi-network-bluetooth', 'connectivity_abstraction', 'coap', 'octbstack', 'ocsrm', 'c_common'
 ])

diff --git a/resource/csdk/stack/samples/tizen/build/SConscript b/resource/csdk/stack/samples/tizen/build/SConscript
index 3f4efc8..9ac3d17 100644 (file)
--- a/resource/csdk/stack/samples/tizen/build/SConscript
+++ b/resource/csdk/stack/samples/tizen/build/SConscript
@@ -38,9 +38,6 @@ elif routing == 'EP':
        env.AppendUnique(CPPDEFINES = ['ROUTING_EP'])
 env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
 
-if env.get('WITH_PROXY'):
-       env.AppendUnique(CPPDEFINES = ['WITH_CHPROXY'])
-
 print "Given Transport is %s" % transport
 print "Given OS is %s" % target_os
 

diff --git a/resource/csdk/stack/src/ocstack.c b/resource/csdk/stack/src/ocstack.c
index 23cdfb6..7d7cd1b 100644 (file)
--- a/resource/csdk/stack/src/ocstack.c
+++ b/resource/csdk/stack/src/ocstack.c
@@ -4823,12 +4823,10 @@ bool OCResultToSuccess(OCStackResult ocResult)
     }
 }
 
-#ifdef WITH_CHPROXY
 OCStackResult OCSetProxyURI(const char *uri)
 {
     return CAResultToOCResult(CASetProxyUri(uri));
 }
-#endif
 
 #if defined(RD_CLIENT) || defined(RD_SERVER)
 OCStackResult OCBindResourceInsToResource(OCResourceHandle handle, uint8_t ins)