dect
/
asterisk
Archived
13
0
Fork 0
Commit Graph

10067 Commits

Author SHA1 Message Date
rizzo 6a1a45a520 silent warning from a debugging message (which will go away
soon, anyways)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45611 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 22:40:02 +00:00
file 776e8e675a Just for Nicholson - here's an option, C, to Meetme that will allow it to continue in the dialplan if the person is kicked out. (issue #7994 reported by mnicholson with mods by myself)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45610 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 22:19:57 +00:00
rizzo fb300e0612 remove trailing whitespace
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45599 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 21:41:09 +00:00
rizzo d68ba2d09f ouch! remember to unlink temporary files once done with them.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45598 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 21:36:20 +00:00
rizzo 93784d6aba + move output_format variables in the http section of the file;
+ more comments on struct mansession and global variables;
+ small improvements to the session matching code so it supports
  multiple sessions from the same IP



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45597 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 21:30:21 +00:00
file d57f0c668b Merged revisions 45595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45595 | file | 2006-10-18 17:03:34 -0400 (Wed, 18 Oct 2006) | 2 lines

Don't modify things if we are using vfork as this is very bad and may cause unexpected behavior (issue #7970 reported by Nick Gavrikov)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45596 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 21:05:52 +00:00
rizzo 90c480f49d another bunch of comments on the data structures.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45583 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 17:53:47 +00:00
rizzo 713b6b817a despite the large changes, this commit only moves functions
around so that functions belonging to the same group are
close to each other.

At the beginning of each group i have added a bit of documentation
to explain what the group does and what is the typical flow - basically,
all i have learned by code inspection over the past few days should
be documented for you to read.

I have not put many doxygen annotations just because i am not
sure what are the proper ones. Hopefully some doxygen experts will jump in.

Next on the plate: try to figure out how "struct eventqent"
are supposed to work.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45582 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 17:45:50 +00:00
rizzo 78cdd30eba more comment and formatting fixes, small simplifications
to functions get_input() and session_do()



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45572 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 16:52:13 +00:00
mogorman da8aef1fc3 rizzo compile then commit, maybe even run it too ^_^
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45571 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 16:45:22 +00:00
rizzo 13dc47f57d comment and cleanup the main thread.
On passing, fix a bug: close the socket if the allocation
of a structure for the new session fails.
(the bugfix is a candidate for 1.4)



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45561 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 15:49:40 +00:00
rizzo fdb5962fae create a new (internal, for the time being) function astman_start_ack()
to start manager responses that need further lines.
This removes a lot of duplicate code from the various handlers
that at the moment build an ActionID string themselves.

Once settled, the function should move to manager.h so
it can be used by other files (chan_agent, chan_iax2, chan_sip,
chan_zap, res_jabber and app_queue).

I am not totally clear if there is a preferred position for
the ActionID: line in a message. Some instances put it at
the end, but one would argue that it is preferable to have
it at the beginning.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45551 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 14:21:15 +00:00
rizzo 59bee9954d more indentation cleanup from previous commits,
and remove the "busy" field from struct mansession
as it was not used correctly anyways.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45541 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 13:42:14 +00:00
rizzo 67fc1bcd75 create proper handlers for "Challenge" and "Login" actions,
rather than use inline code for them.
Things are more readable this way, and also error processing
is more consistent.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45540 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 13:23:22 +00:00
rizzo 2a74685732 fix indentation from a commit of a couple of days ago
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45530 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 12:55:12 +00:00
rizzo 18827b8ac3 another batch of simplifications to authenticate()
(they are committed a bit at a time so it is easier to
revert them in case we find a bug at a later time).



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45529 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 12:38:24 +00:00
oej 4d2dc31e34 Remove duplicate declarations...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45528 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 12:15:23 +00:00
rizzo 3933708d51 remove unused fields and unimplemented options.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45518 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 11:59:08 +00:00
rizzo 440510b692 first pass as simplifying authenticate(), avoiding whitespace changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45516 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 11:54:06 +00:00
rizzo fbe8d94965 more code simplifications
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45515 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 11:43:31 +00:00
rizzo ab2bb64d8a simplify ast_strings_to_mask
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45505 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 10:14:58 +00:00
rizzo 22d613b827 add a comment to remember that a block of code is
completely redundant.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45495 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 08:48:50 +00:00
rizzo 155fe80952 + move the enum declaration for output formats near the head
of the file, so it can be used from more places;
+ make the declaration of contenttype[] more robust;
+ remove the wrappers around __xml_translate(), since they were
  used only in one place, and rename to xml_translate().
  This allows for a bit of simplifications.
+ document the output produced by the above function.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45485 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 06:28:34 +00:00
rizzo 519206a7ef merge xml_translate() and html_translate() into one function since
they do similar things.

Add a small form on top of the html output so request like
http://foo:8088/asterisk/manager will suggest you what to do.

Note: i suspect there is still a bug somewhere in the session matching
code, as sometimes you have to login twice in order for the following
commands to be recognised.

Apart from this, the cli now is basically usable from a web form!



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45475 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 05:31:54 +00:00
rizzo 196862402f introduce uri_decode() so that '+' are translated into ' '
(e.g. browsers do this when they encode input strings from a form).



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45474 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 05:27:22 +00:00
rizzo 0678982f62 various code simplifications to reduce nesting depth,
minor optimizations to avoid extra calls of strlen(),
and some variable localization.

One feature worth backporting is the move of ast_variables_destroy()
to a different place in handle_uri() to avoid leaking memory
in case a uri is not found.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45463 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 04:05:56 +00:00
file 3f6e3c58fc Merged revisions 45452 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45452 | file | 2006-10-17 23:02:08 -0400 (Tue, 17 Oct 2006) | 2 lines

Don't segfault if you're using a channel driver that doesn't turn RTCP on

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45453 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 03:03:37 +00:00
russell f2f143da66 Merged revisions 45441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45441 | russell | 2006-10-17 22:41:36 -0400 (Tue, 17 Oct 2006) | 7 lines

Don't attempt to access private data members of the pthread_mutex_t object,
because this does not work on all linux systems.  Instead, just access
the reentrancy field in the ast_mutex_info struct when DEBUG_THREADS is
enabled.  If DEBUG_CHANNEL_LOCKS is enabled, the developer probably has
DEBUG_THREADS on as well.
(issue #8139, me)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45442 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 02:46:39 +00:00
russell 05a566b3b0 Merged revisions 45439 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45439 | russell | 2006-10-17 22:19:07 -0400 (Tue, 17 Oct 2006) | 2 lines

update entry to reboot a snom phone (issue #7850, pnlarsson)

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45440 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-18 02:19:55 +00:00
murf 7f2a3da6d5 As per bug 6779, this patch is now applied to trunk; while I was at it, I corrected a reference to a CLI command, to follow the new regime.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45426 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 23:06:13 +00:00
kpfleming 06ad7f4b6a Merged revisions 45410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45410 | kpfleming | 2006-10-17 17:31:54 -0500 (Tue, 17 Oct 2006) | 2 lines

add a project-specific script to be used during release preparation

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45411 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 22:32:19 +00:00
kpfleming 05c0b1648b Merged revisions 45408 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45408 | kpfleming | 2006-10-17 17:24:10 -0500 (Tue, 17 Oct 2006) | 3 lines

optimize the 'quick response' code a bit more... no more malloc() or memset() for each response
expand stringfields API a bit to allow reusing the stringfield pool on a structure when needed, and remove some unnecessary code when the structure was being freed

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45409 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 22:24:45 +00:00
file b31277825f Warning be gone!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45398 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 21:09:49 +00:00
file 75ad7ef205 Blocked revisions 45381 via svnmerge
................
r45381 | file | 2006-10-17 16:38:15 -0400 (Tue, 17 Oct 2006) | 9 lines

Blocked revisions 45380 via svnmerge

........
r45380 | file | 2006-10-17 16:37:17 -0400 (Tue, 17 Oct 2006) | 2 lines

Don't create a "real" pvt structure for requests that shouldn't be able to create one. Instead use a temporary pvt and fill it with enough information so we can send a reply.

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45382 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 20:38:55 +00:00
file c0883395fc Merged revisions 45378 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45378 | file | 2006-10-17 16:30:34 -0400 (Tue, 17 Oct 2006) | 2 lines

Don't create a "real" pvt structure for requests that shouldn't be able to create one. Instead use a temporary pvt and fill it with enough information so we can send a reply.

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45379 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 20:34:22 +00:00
oej d80770ba4d Issue #5484 (branch sipdiversion) - Support for Diversion header in redirects of calls
with 302 redirection. (tinning)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45365 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 19:57:35 +00:00
rizzo 7813852f07 simplify authority_to_str() using ast_build_string()
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45351 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 18:08:51 +00:00
oej f1da83c46e Issue #7254 - Add support of "423 Interval too brief" to outbound SIP registrations.
Thanks, tardieu!


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45335 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:54:59 +00:00
rizzo 04aba2dbed Improve the XML formatting of responses coming from web interface.
Normal responses are sequences of lines of the form "Name: value",
with \r\n as line terminators and an empty line as a response
terminator.

Generi CLI commands, however, do not have such a clean formatting,
and the existing code failed to generate valid XML for them.
Obviously we can only use heuristics here, and we do the following:
- accept either \r or \n as a line terminator, trimming trailing whitespace;
- if a line does not have a ":" in it, assume that from this point on
  we have unformatted data, and use "Opaque-data:" as a name;
- if a line does have a ":" in it, the Name field is not always
  a legal identifier, so replace non-alphanum characters with underscores;

All the above is to be refined as we improve the formatting of
responses from the CLI.

And, all the above ought to go as a comment in the code rather than
just in a commit message...
  


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45334 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:51:34 +00:00
oej 491cd75797 Update of docs
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45333 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:51:34 +00:00
oej ec7a5b6ec1 - Remove unneeded code that won't be reached now that we kill responses
to unkonwn dialogs earlier in the process. 
- move debug message.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45331 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:47:09 +00:00
rizzo 2e31cdbf7e open a temporary file to receive the output from cli commands
invoked through the http interface.

It is not terribly efficient but better than no output at all.
Todo: use a configurable /tmp directory instead of a hardwired one.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45330 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:41:59 +00:00
kpfleming b6e0ce41a3 Merged revisions 45327 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45327 | kpfleming | 2006-10-17 12:22:25 -0500 (Tue, 17 Oct 2006) | 10 lines

Merged revisions 45326 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45326 | kpfleming | 2006-10-17 12:22:01 -0500 (Tue, 17 Oct 2006) | 2 lines

provide licensing language for IAXy firmware file

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45328 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:22:52 +00:00
rizzo 7673e5c24a document xml_copy_escape() and add an extra function, namely
replace non-alphanum chars with underscore.
This is useful when building field names in xml formatting.



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45325 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 17:19:31 +00:00
oej ba83221f3e ...block this one too... Only applies to 1.4 since the fix for trunk was different.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45316 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 16:27:01 +00:00
oej a834212e3b Block patch from 1.4 that does not apply here.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45315 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 16:25:03 +00:00
oej 1724edd87e Get rid of the ignore variable that was only partially replaced
by the flag.


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45295 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-17 06:47:02 +00:00
file 37043c611d In the course of a data this has been turned into an option to ignore replies, then ignore responses and finally I'm just getting rid of the option altogether and making it the default no matter what. C'est la vie!
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45286 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-16 20:26:56 +00:00
file fa6887f2f7 Woof.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45282 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-16 20:10:05 +00:00
file 25fe75c6c7 Merged revisions 45280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45280 | file | 2006-10-16 16:06:18 -0400 (Mon, 16 Oct 2006) | 10 lines

Merged revisions 45265 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45265 | file | 2006-10-16 15:59:54 -0400 (Mon, 16 Oct 2006) | 2 lines

Use responses rather then replies even though they mean the same thing.

........

................


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@45281 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-16 20:08:23 +00:00