|
|
|
|
@ -482,91 +482,6 @@ struct ast_frame *ast_frdup(const struct ast_frame *f)
|
|
|
|
|
return out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
/*
|
|
|
|
|
* XXX
|
|
|
|
|
* This function is badly broken - it does not handle correctly
|
|
|
|
|
* partial reads on either header or body.
|
|
|
|
|
* However is it never used anywhere so we leave it commented out
|
|
|
|
|
*/
|
|
|
|
|
struct ast_frame *ast_fr_fdread(int fd)
|
|
|
|
|
{
|
|
|
|
|
char buf[65536];
|
|
|
|
|
int res;
|
|
|
|
|
struct ast_frame *f = (struct ast_frame *)buf;
|
|
|
|
|
int ttl = sizeof(*f);
|
|
|
|
|
/* Read a frame directly from there. They're always in the
|
|
|
|
|
right format. */
|
|
|
|
|
|
|
|
|
|
while(ttl) {
|
|
|
|
|
res = read(fd, buf, ttl);
|
|
|
|
|
if (res < 0) {
|
|
|
|
|
ast_log(LOG_WARNING, "Bad read on %d: %s\n", fd, strerror(errno));
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
ttl -= res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* read the frame header */
|
|
|
|
|
|
|
|
|
|
/* Re-write data position */
|
|
|
|
|
f->data = buf + sizeof(*f);
|
|
|
|
|
f->offset = 0;
|
|
|
|
|
/* Forget about being mallocd */
|
|
|
|
|
f->mallocd = 0;
|
|
|
|
|
/* Re-write the source */
|
|
|
|
|
f->src = (char *)__FUNCTION__;
|
|
|
|
|
if (f->datalen > sizeof(buf) - sizeof(*f)) {
|
|
|
|
|
/* Really bad read */
|
|
|
|
|
ast_log(LOG_WARNING, "Strange read (%d bytes)\n", f->datalen);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
if (f->datalen) {
|
|
|
|
|
if ((res = read(fd, f->data, f->datalen)) != f->datalen) {
|
|
|
|
|
/* Bad read */
|
|
|
|
|
ast_log(LOG_WARNING, "How very strange, expected %d, got %d\n", f->datalen, res);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP)) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return ast_frisolate(f);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Some convenient routines for sending frames to/from stream or datagram
|
|
|
|
|
sockets, pipes, etc (maybe even files) */
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* XXX this function is also partly broken because it does not handle
|
|
|
|
|
* partial writes. We comment it out too, and also the unique
|
|
|
|
|
* client it has, ast_fr_fdhangup()
|
|
|
|
|
*/
|
|
|
|
|
int ast_fr_fdwrite(int fd, struct ast_frame *frame)
|
|
|
|
|
{
|
|
|
|
|
/* Write the frame exactly */
|
|
|
|
|
if (write(fd, frame, sizeof(*frame)) != sizeof(*frame)) {
|
|
|
|
|
ast_log(LOG_WARNING, "Write error: %s\n", strerror(errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (write(fd, frame->data, frame->datalen) != frame->datalen) {
|
|
|
|
|
ast_log(LOG_WARNING, "Write error: %s\n", strerror(errno));
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int ast_fr_fdhangup(int fd)
|
|
|
|
|
{
|
|
|
|
|
struct ast_frame hangup = {
|
|
|
|
|
AST_FRAME_CONTROL,
|
|
|
|
|
AST_CONTROL_HANGUP
|
|
|
|
|
};
|
|
|
|
|
return ast_fr_fdwrite(fd, &hangup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif /* unused functions */
|
|
|
|
|
|
|
|
|
|
void ast_swapcopy_samples(void *dst, const void *src, int samples)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|