← Back to branch summary

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

« back to all changes in this revision

Viewing changes to modules/afstreams/afstreams.c

  • Committer: Package Import Robot
  • Author(s): Laszlo Boszormenyi (GCS), Gergely Nagy
  • Date: 2011-10-11 14:30:48 UTC
  • mfrom: (1.3.7)
  • Revision ID: package-import@ubuntu.com-20111011143048-r1iljux9xbvj3lwh
Tags: 3.3.1.dfsg-1
http://bugs.debian.org/496521
http://bugs.debian.org/616069
http://bugs.debian.org/630172
http://bugs.debian.org/609154
http://bugs.debian.org/608605
http://bugs.debian.org/644458
http://bugs.debian.org/634715
http://bugs.debian.org/589081
* New upstream release with important fixes from upstream git tree with
  non-free manpages removed.
* Drop syslog-ng.conf(5) (closes: #496521).
* syslog-ng(8) is generated, and does not mention -Q anymore
  (closes: #616069).
* Supports CAP_SYSLOG on recent kernels (closes: #630172).
* Does not use g_timeout_add_seconds anymore (closes: #609154).

[ Gergely Nagy <algernon@madhouse-project.org> ]
* Update debian/copyright to DEP-5 format.
* Simplified the logrotate file by merging identical entries.
* Include local configuration files from /etc/syslog-ng/conf.d/ (Closes:
  #609050).
* Update syslog-ng.conf to be fully 3.3 compliant.
* Compress both source and binaries (except the syslog-ng meta
  package) with xz, instead of gzip.
* Use dpkg triggers to restart syslog-ng when appropriate.
* Include DFSG-free manual pages for all binaries.
* Build with Hardening enabled.
* Mention syslog(3) in /etc/default/syslog-ng, instead of
  <linux/kernel.h> (Closes: #608605)
* Support 'status' in the init script.
  Patch from Peter Eisentraut <petere@debian.org> (Closes: #644458)
* Build-Depend on libevtlog-dev (>= 0.2.12-5~) for correct shlibs.
* Use [linux-any] in Build-Depends instead of hardcoded links.
  (Closes: #634715)
* Use $SYSLOGNG_OPTS in the init script when reloading syslog-ng.
  (Closes: #589081)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/afstreams/afstreams.c
30
30
 
31
31
typedef struct _AFStreamsSourceDriver
32
32
{
33
 
  LogDriver super;
 
33
  LogSrcDriver super;
34
34
  GString *dev_filename;
35
35
  GString *door_filename;
36
36
  gint door_fd;
165
165
  GlobalConfig *cfg = log_pipe_get_config(s);
166
166
  gint fd;
167
167
 
168
 
  log_reader_options_init(&self->reader_options, cfg, self->super.group);
 
168
  if (!log_src_driver_init_method(s))
 
169
    return FALSE;
 
170
 
 
171
  log_reader_options_init(&self->reader_options, cfg, self->super.super.group);
169
172
 
170
173
  fd = open(self->dev_filename->str, O_RDONLY | O_NOCTTY | O_NONBLOCK);
171
174
  if (fd != -1)
186
189
        }
187
190
      g_fd_set_nonblock(fd, TRUE);
188
191
      self->reader = log_reader_new(log_proto_dgram_server_new(log_transport_streams_new(fd), self->reader_options.msg_size, 0));
189
 
      log_reader_set_options(self->reader, s, &self->reader_options, 1, SCS_SUN_STREAMS, self->super.id, self->dev_filename->str);
 
192
      log_reader_set_options(self->reader, s, &self->reader_options, 1, SCS_SUN_STREAMS, self->super.super.id, self->dev_filename->str);
190
193
      log_pipe_append(self->reader, s);
191
194
 
192
195
      if (self->door_filename)
233
236
      door_revoke(self->door_fd);
234
237
      close(self->door_fd);
235
238
    }
 
239
 
 
240
  if (!log_src_driver_deinit_method(s))
 
241
    return FALSE;
 
242
 
236
243
  return TRUE;
237
244
}
238
245
 
248
255
    g_string_free(self->door_filename, TRUE);
249
256
  log_pipe_unref(self->reader);
250
257
 
251
 
  log_drv_free(s);
 
258
  log_src_driver_free(s);
252
259
}
253
260
 
254
261
LogDriver *
256
263
{
257
264
  AFStreamsSourceDriver *self = g_new0(AFStreamsSourceDriver, 1);
258
265
 
259
 
  log_drv_init_instance(&self->super);
 
266
  log_src_driver_init_instance(&self->super);
260
267
 
261
268
  self->dev_filename = g_string_new(filename);
262
 
  self->super.super.init = afstreams_sd_init;
263
 
  self->super.super.deinit = afstreams_sd_deinit;
264
 
  self->super.super.free_fn = afstreams_sd_free;
 
269
  self->super.super.super.init = afstreams_sd_init;
 
270
  self->super.super.super.deinit = afstreams_sd_deinit;
 
271
  self->super.super.super.free_fn = afstreams_sd_free;
265
272
  log_reader_options_defaults(&self->reader_options);
266
 
  self->reader_options.flags |= LR_LOCAL;
 
273
  self->reader_options.parse_options.flags |= LP_LOCAL;
267
274
  self->reader_options.parse_options.flags &= ~LP_EXPECT_HOSTNAME;
268
 
  return &self->super;
 
275
  return &self->super.super;
269
276
}
270
277
#else
271
278
 
291
298
{
292
299
  LogDriver *self = g_new0(LogDriver, 1);
293
300
 
294
 
  log_drv_init_instance(self);
 
301
  log_src_driver_init_instance(self);
295
302
  self->super.init = afstreams_sd_dummy_init;
296
303
  self->super.deinit = afstreams_sd_dummy_deinit;
297
 
  self->super.free_fn = log_drv_free;
 
304
  self->super.free_fn = log_src_driver_free;
298
305
  return self;
299
306
}
300
307