-const char jcc_rcs[] = "$Id: jcc.c,v 1.13 2001/05/29 09:50:24 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.16 2001/06/01 18:49:17 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.16 2001/06/01 18:49:17 jongfoster
+ * Replaced "list_share" with "list" - the tiny memory gain was not
+ * worth the extra complexity.
+ *
+ * Revision 1.15 2001/05/31 21:24:47 jongfoster
+ * Changed "permission" to "action" throughout.
+ * Removed DEFAULT_USER_AGENT - it must now be specified manually.
+ * Moved vanilla wafer check into chat(), since we must now
+ * decide whether or not to add it based on the URL.
+ *
+ * Revision 1.14 2001/05/29 20:14:01 joergs
+ * AmigaOS bugfix: PCRS needs a lot of stack, stacksize for child threads
+ * increased.
+ *
* Revision 1.13 2001/05/29 09:50:24 jongfoster
* Unified blocklist/imagelist/permissionslist.
* File format is still under discussion, but the internal changes
#endif
#include "project.h"
+#include "list.h"
#include "jcc.h"
#include "filters.h"
#include "loaders.h"
#include "errlog.h"
#include "jbsockets.h"
#include "gateway.h"
+#include "actions.h"
const char jcc_h_rcs[] = JCC_H_VERSION;
const char project_h_rcs[] = PROJECT_H_VERSION;
-const char DEFAULT_USER_AGENT[] ="User-Agent: Mozilla (X11; I; Linux 2.0.32 i586)";
-
struct client_state clients[1];
struct file_list files[1];
#endif
+/* The vanilla wafer. */
+static const char VANILLA_WAFER[] =
+ "NOTICE=TO_WHOM_IT_MAY_CONCERN_"
+ "Do_not_send_me_any_copyrighted_information_other_than_the_"
+ "document_that_I_am_requesting_or_any_of_its_necessary_components._"
+ "In_particular_do_not_send_me_any_cookies_that_"
+ "are_subject_to_a_claim_of_copyright_by_anybody._"
+ "Take_notice_that_I_refuse_to_be_bound_by_any_license_condition_"
+ "(copyright_or_otherwise)_applying_to_any_cookie._";
+
+
/*********************************************************************
*
* Function : chat
#ifdef TOGGLE
if (!csp->toggled_on)
{
- /* Most compatible set of permissions */
- csp->permissions = PERMIT_MOST_COMPATIBLE;
+ /* Most compatible set of actions (i.e. none) */
+ init_current_action(csp->action);
}
else
#endif /* ndef TOGGLE */
{
- csp->permissions = url_permissions(http, csp);
+ url_actions(http, csp);
+ }
+
+#ifdef JAR_FILES
+ /*
+ * If we're logging cookies in a cookie jar, and the user has not
+ * supplied any wafers, and the user has not told us to suppress the
+ * vanilla wafer, then send the vanilla wafer.
+ */
+ if ((csp->config->jarfile != NULL)
+ && (csp->action->multi[ACTION_MULTI_WAFER]->next == NULL)
+ && ((csp->action->flags & ACTION_VANILLA_WAFER) != 0))
+ {
+ enlist(csp->action->multi[ACTION_MULTI_WAFER], VANILLA_WAFER);
}
+#endif /* def JAR_FILES */
#ifdef KILLPOPUPS
- block_popups = ((csp->permissions & PERMIT_POPUPS) == 0);
+ block_popups = ((csp->action->flags & ACTION_NO_POPUPS) != 0);
#endif /* def KILLPOPUPS */
#ifdef PCRS
pcrs_filter = (csp->rlist != NULL) && /* There are expressions to be used */
- ((csp->permissions & PERMIT_RE_FILTER) != 0);
+ ((csp->action->flags & ACTION_FILTER) != 0);
#endif /* def PCRS */
#ifdef FAST_REDIRECTS
else if (IS_ENABLED_AND
- ((csp->permissions & PERMIT_FAST_REDIRECTS) != 0) &&
+ ((csp->action->flags & ACTION_FAST_REDIRECTS) != 0) &&
(p = redirect_url(http, csp)))
{
/* This must be blocked as HTML */
#ifdef IMAGE_BLOCKING
/* Block as image? */
- if ( (csp->config->tinygif > 0) && block_imageurl(http, csp) )
+ if ( ((csp->action->flags & ACTION_IMAGE_BLOCKER) != 0)
+ && block_imageurl(http, csp) )
{
/* Send "blocked" image */
- log_error(LOG_LEVEL_GPC, "%s%s image crunch!",
- http->hostport, http->path);
+ const char * blocker = csp->action->string[ACTION_STRING_IMAGE_BLOCKER];
- if (csp->config->tinygif == 1)
- {
- write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
- }
- else if (csp->config->tinygif == 2)
+ log_error(LOG_LEVEL_GPC, "%s%s image crunch! --> %s",
+ http->hostport, http->path, (blocker ? blocker : "logo"));
+
+ if ((blocker == NULL) || (0 == strcmpic(blocker, "logo")))
{
write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
}
- else if ((csp->config->tinygif == 3) && (csp->config->tinygifurl))
+ else if (0 == strcmpic(blocker, "blank"))
{
- freez(p);
- p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE)
- + strlen(csp->config->tinygifurl));
- sprintf(p, HTTP_REDIRECT_TEMPLATE, csp->config->tinygifurl);
- write_socket(csp->cfd, p, strlen(p));
+ write_socket(csp->cfd, BLANKGIF, sizeof(BLANKGIF)-1);
}
else
{
- /* Should never happen */
- write_socket(csp->cfd, JBGIF, sizeof(JBGIF)-1);
+ freez(p);
+ p = (char *)malloc(sizeof(HTTP_REDIRECT_TEMPLATE) + strlen(blocker));
+ sprintf(p, HTTP_REDIRECT_TEMPLATE, blocker);
+ write_socket(csp->cfd, p, strlen(p));
}
}
else
#endif /* def IMAGE_BLOCKING */
/* Block as HTML */
{
- /* Send HTML "blocked" message, interception, or redirection result */
+ /* Send HTML "blocked" message */
write_socket(csp->cfd, p, strlen(p));
}