Modifying conflicts between WiFi and P2P IP addresses Singed-off-by:dongzhengkuan@huawei.com

Signed-off-by: 15549494042 <dongzhengkuan@huawei.com>

ohos_ip_conflict_01.patch

@@ -1,7 +1,7 @@
-diff --git a/cups-2.4.0/cups/http.h b/cups-2.4.0/cups/http.h
+diff --git a/cups/http.h b/cups/http.h
 index 6c45301e..ac166970 100644
---- a/cups-2.4.0/cups/http.h
-+++ b/cups-2.4.0/cups/http.h
+--- a/cups/http.h
++++ b/cups/http.h
 @@ -556,10 +556,11 @@ extern int		httpSetCredentials(http_t *http, cups_array_t *certs) _CUPS_API_1_5;
  extern void		httpSetTimeout(http_t *http, double timeout, http_timeout_cb_t cb, void *user_data) _CUPS_API_1_5;
  

ohos_ip_conflict_02.patch

@@ -1,7 +1,7 @@
-diff --git a/cups-2.4.0/cups/http.c b/cups-2.4.0/cups/http.c
+diff --git a/cups/http.c b/cups/http.c
 index 66dd3b07..e98c0550 100644
---- a/cups-2.4.0/cups/http.c
-+++ b/cups-2.4.0/cups/http.c
+--- a/cups/http.c
++++ b/cups/http.c
 @@ -476,6 +476,53 @@ httpConnect2(
    return (NULL);
  }

ohos_ip_conflict_03.patch

@@ -1,7 +1,7 @@
-diff --git a/cups-2.4.0/cups/http-addrlist.c b/cups-2.4.0/cups/http-addrlist.c
+diff --git a/cups/http-addrlist.c b/cups/http-addrlist.c
 index 6e73464c..36b410e8 100644
---- a/cups-2.4.0/cups/http-addrlist.c
-+++ b/cups-2.4.0/cups/http-addrlist.c
+--- a/cups/http-addrlist.c
++++ b/cups/http-addrlist.c
 @@ -39,7 +39,7 @@ httpAddrConnect(
  {
    DEBUG_printf(("httpAddrConnect(addrlist=%p, sock=%p)", (void *)addrlist, (void *)sock));
@@ -16,7 +16,7 @@ index 6e73464c..36b410e8 100644
      int             *sock,		/* O - Socket */
      int             msec,		/* I - Timeout in milliseconds */
 -    int             *cancel)		/* I - Pointer to "cancel" variable */
-+    int             *cancel		/* I - Pointer to "cancel" variable */
++    int             *cancel,		/* I - Pointer to "cancel" variable */
 +    const char      *nic)
  {
    int			val;		/* Socket option value */

ohos_ip_conflict_04.patch

@@ -1,7 +1,7 @@
-diff --git a/cups-2.4.0/backend/ipp.c b/cups-2.4.0/backend/ipp.c
+diff --git a/backend/ipp.c b/backend/ipp.c
 index c4b34668..60b867a0 100644
---- a/cups-2.4.0/backend/ipp.c
-+++ b/cups-2.4.0/backend/ipp.c
+--- a/backend/ipp.c
++++ b/backend/ipp.c
 @@ -64,6 +64,7 @@ typedef struct _cups_monitor_s		/**** Monitoring data ****/
    ipp_jstate_t		job_state;	/* Current job state */
    ipp_pstate_t		printer_state;	/* Current printer state */

ohos_ip_conflict_05.patch

@@ -1,7 +1,7 @@
-diff --git a/cups-2.4.0/tools/ippeveprinter.c b/cups-2.4.0/tools/ippeveprinter.c
+diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
 index 2da5ed52..39274b6f 100644
---- a/cups-2.4.0/tools/ippeveprinter.c
-+++ b/cups-2.4.0/tools/ippeveprinter.c
+--- a/tools/ippeveprinter.c
++++ b/tools/ippeveprinter.c
 @@ -6842,7 +6842,7 @@ process_job(ippeve_job_t *job)		/* I - Job */
  
          if ((addrlist = httpAddrGetList(host, AF_UNSPEC, service)) == NULL)