-const char jcc_rcs[] = "$Id: jcc.c,v 1.1.1.1 2001/05/15 13:58:56 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.2 2001/05/17 22:34:44 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.2 2001/05/17 22:34:44 oes
+ * - Added hint on GIF char array generation to jcc.c
+ * - Cleaned CRLF's from the sources and related files
+ * - Repaired logging for REF and FRC
+ *
* Revision 1.1.1.1 2001/05/15 13:58:56 oes
* Initial import of version 2.9.3 source tree
*
*********************************************************************/
static void chat(struct client_state *csp)
{
+/* This next line is a little ugly, but it simplifies the if statement below. */\r
+/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */\r
+#ifdef TOGGLE\r
+# define IS_TOGGLED_ON csp->toggled_on &&\r
+#else /* ifndef TOGGLE */\r
+# define IS_TOGGLED_ON\r
+#endif /* ndef TOGGLE */\r
+\r
+/* This next line is a little ugly, but it simplifies the if statement below. */\r
+/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */\r
+#ifdef TRUST_FILES\r
+# define IS_TRUSTED_URL (p = trust_url(http, csp)) ||\r
+#else /* ifndef TRUST_FILES */\r
+# define IS_TRUSTED_URL\r
+#endif /* ndef TRUST_FILES */\r
+\r
+ \r
char buf[BUFSIZ], *hdr, *p, *req;
char *err = NULL;
char *eno;
fd_set rfds;
int n, maxfd, server_body, ms_iis5_hack = 0;
- struct cookie_spec *cs;
const struct gateway *gw;
- struct http_request *http;
+ struct http_request *http;\r
+#ifdef KILLPOPUPS\r
+ int block_popups; /* bool, 1==will block popups */\r
+ int block_popups_now = 0; /* bool, 1==currently blocking popups */\r
+#endif /* def KILLPOPUPS */\r
#ifdef PCRS
- int filtering = 0;
+ int pcrs_filter; /* bool, 1==will filter through pcrs */\r
+ int filtering = 0; /* bool, 1==currently filtering through pcrs */
#endif /* def PCRS */
http = csp->http;
if(strstr(req, FORCE_PREFIX))
{
strclean(req, FORCE_PREFIX);
- log_error(LOG_LEVEL_FRC, "Enforcing request \"%s\".\n", req);
+ log_error(LOG_LEVEL_FORCE, "Enforcing request \"%s\".\n", req);
csp->force = 1;
}
else
if ((gw = forward_url(http, csp)) == NULL)
{
- log_error(LOG_LEVEL_ERROR, "gateway spec is NULL!?!? This can't happen!");
- abort();
+ log_error(LOG_LEVEL_FATAL, "gateway spec is NULL!?!? This can't happen!");
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */\r
}
/* build the http request to send to the server
freez(p);
}
}
-
+\r
/* decide what we're to do with cookies */
-
-#if defined(TOGGLE)
- /*
- * by haroon - most of credit to srt19170
- * if toggled_on flag is false IJB is disabled, pass cookies thru
- */
- if (!csp->toggled_on)
- {
- csp->accept_server_cookie = 1;
- csp->send_user_cookie = 1;
- }
- else
-#endif
-
- if ((cs = cookie_url(http, csp)))
- {
- csp->accept_server_cookie = cs->accept_server_cookie;
- csp->send_user_cookie = cs->send_user_cookie;
- }
- else
- {
- csp->accept_server_cookie = 0;
- csp->send_user_cookie = 0;
- }
+\r
+#ifdef TOGGLE\r
+ if (!csp->toggled_on)\r
+ {\r
+ /* Most compatible set of permissions */\r
+ csp->permissions = PERMIT_COOKIE_SET | PERMIT_COOKIE_READ | PERMIT_POPUPS;\r
+ }\r
+ else\r
+ {\r
+ csp->permissions = url_permissions(http, csp);\r
+ }\r
+#else /* ifndef TOGGLE */\r
+ csp->permissions = url_permissions(http, csp);\r
+#endif /* ndef TOGGLE */\r
+\r
+#ifdef KILLPOPUPS\r
+ block_popups = ((csp->permissions & PERMIT_POPUPS) == 0);\r
+#endif /* def KILLPOPUPS */\r
+#ifdef PCRS\r
+ pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */\r
+ ((csp->permissions & PERMIT_RE_FILTER) != 0);
+#endif /* def PCRS */\r
+\r
/* grab the rest of the client's headers */
destroy_list(csp->headers);
-#ifdef TOGGLE
- /*
- * by haroon - most of credit to srt19170
- * if toggled_on flag is true then IJB is enabled, do the usual
- * otherwise avoid crunching
- */
-
-/* This next line is a little ugly, but it simplifies the if statement below. */
-/* Basically if TOGGLE, then we want the if to test "csp->toggled_on", else we don't */
-#define IS_TOGGLED_ON csp->toggled_on &&
-
-#else /* ifndef TOGGLE */
-
-/* We don't have TOGGLE, so we don't care about toggling. */
-#define IS_TOGGLED_ON
-
-#endif /* ndef TOGGLE */
-
-
-#ifdef TRUST_FILES
-/* This next line is a little ugly, but it simplifies the if statement below. */
-/* Basically if TRUST_FILES, then we want the if to call "trust_url", else we don't */
-#define IS_TRUSTED_URL (p = trust_url(http, csp)) ||
-
-#else /* ifndef TRUST_FILES */
-
-/* We don't have TRUST_FILES, so we don't care about trusted URL's. */
-#define IS_TRUSTED_URL
-
-#endif /* ndef TRUST_FILES */
+ /*\r
+ * by haroon - most of credit to srt19170\r
+ * if toggled_on flag is true then IJB is enabled, do the usual\r
+ * otherwise avoid crunching\r
+ */\r
/* Check the request against all rules, unless
* we're disabled or in force mode.
#ifdef KILLPOPUPS
/* Filter the popups on this read. */
- if ( IS_TOGGLED_ON
- ( kill_all_popups ||
- ( ( http->host != NULL ) && ( popupfile != NULL ) ) ) )
+ if (block_popups_now)
{
- filter_popups(csp, http->host, buf, n);
+ filter_popups(buf, n);
}
#endif /* def KILLPOPUPS */
* the client (along with anything else that
* may be in the buffer)
*/
-
+\r
+#ifdef KILLPOPUPS\r
+ /* Start blocking popups if appropriate. */\r
+\r
+ if (csp->is_text && /* It's a text / * MIME-Type */\r
+ !http->ssl && /* We talk plaintext */\r
+ block_popups)\r
+ {\r
+ block_popups_now = 1;\r
+ }\r
+\r
+#endif /* def KILLPOPUPS */\r
+\r
#ifdef PCRS
- /* Decide if we want to re_filter this. */
-
- if (IS_TOGGLED_ON /* Only filter if toggle is "on" */
- csp->is_text && /* It's a text / * MIME-Type */
- re_filterfile && /* There are expressions to be used */
- !http->ssl && /* We talk plaintext */
- (re_filter_all || !csp->send_user_cookie)) /* Policy allows */
+ /* Start re_filtering this if appropriate. */
+\r
+ if (csp->is_text && /* It's a text / * MIME-Type */
+ !http->ssl && /* We talk plaintext */\r
+ pcrs_filter) /* Policy allows */
{
filtering = 1;
}
if (run_loader(csp))
{
- log_error(LOG_LEVEL_ERROR, "a loader failed - must exit");
- return;
+ log_error(LOG_LEVEL_FATAL, "a loader failed - must exit");\r
+ /* Never get here - LOG_LEVEL_FATAL causes program exit */
}
if (multi_threaded)
projects / privoxy.git / blobdiff