← Back to branch summary

~ubuntu-branches/ubuntu/wily/syslog-ng/wily-proposed

« back to all changes in this revision

Viewing changes to modules/afsocket/afsocket-source.c

  • Committer: Package Import Robot
  • Author(s): Gergely Nagy, Gergely Nagy
  • Date: 2014-07-23 18:44:55 UTC
  • mfrom: (1.3.16)
  • Revision ID: package-import@ubuntu.com-20140723184455-847mc96111c1x6sh
Tags: 3.5.5-1
http://bugs.debian.org/745014
http://bugs.debian.org/747020
[ Gergely Nagy <algernon@madhouse-project.org> ]
* New upstream release, fixing major leaks (hence the urgency)
* Build-Depend on libjson-c-dev | libjson0-dev. (Closes: #745014)
* Add /var/log/error to the logrotate file. (Closes: #747020)
* Include libsyslog-ng-test.a and the related pkg-config file in the
  syslog-ng-dev package.
* Added an upstart init script (mostly for the benefit of older Ubuntu
  releases and backports).
* syslog-ng-mod-redis no longer (mistakenly) recommends geoip-database.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/afsocket/afsocket-source.c
1
1
/*
2
 
 * Copyright (c) 2002-2012 BalaBit IT Ltd, Budapest, Hungary
 
2
 * Copyright (c) 2002-2014 BalaBit IT Ltd, Budapest, Hungary
3
3
 * Copyright (c) 1998-2012 Balázs Scheidler
4
4
 *
5
5
 * This program is free software; you can redistribute it and/or modify it
89
89
      proto = log_proto_server_factory_construct(self->owner->proto_factory, transport, &self->owner->reader_options.proto_options.super);
90
90
      self->reader = log_reader_new();
91
91
      log_reader_reopen(self->reader, proto, poll_fd_events_new(self->sock));
 
92
      log_reader_set_peer_addr(self->reader, self->peer_addr);
92
93
    }
93
94
  log_reader_set_options(self->reader, s,
94
95
                         &self->owner->reader_options,
96
97
                         self->owner->transport_mapper->stats_source,
97
98
                         self->owner->super.super.id,
98
99
                         afsocket_sc_stats_instance(self));
99
 
  log_reader_set_peer_addr(self->reader, self->peer_addr);
100
100
  log_pipe_append((LogPipe *) self->reader, s);
101
101
  if (log_pipe_init((LogPipe *) self->reader, NULL))
102
102
    {
659
659
 
660
660
  log_reader_options_destroy(&self->reader_options);
661
661
  transport_mapper_free(self->transport_mapper);
 
662
  socket_options_free(self->socket_options);
662
663
  g_sockaddr_unref(self->bind_addr);
663
664
  self->bind_addr = NULL;
664
665
  log_src_driver_free(s);