← Back to branch summary

~indicator-network-developers/ofono/trunk.packaging

« back to all changes in this revision

Viewing changes to gatchat/ppp_lcp.c

  • Committer: Kalle Valo
  • Date: 2011-02-21 07:46:07 UTC
  • mfrom: (2738.1.2125)
  • Revision ID: kalle.valo@canonical.com-20110221074607-u4rocuj2p75kpht9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gatchat/ppp_lcp.c
105
105
 
106
106
static void lcp_reset_config_options(struct lcp_data *lcp)
107
107
{
108
 
        lcp->req_options = REQ_OPTION_ACCM;
109
 
        lcp->accm = 0;
 
108
        /* Using the default ACCM */
110
109
 
111
110
        lcp_generate_config_options(lcp);
112
111
}
147
146
        ppp_option_iter_init(&iter, packet);
148
147
 
149
148
        while (ppp_option_iter_next(&iter) == TRUE) {
 
149
                const guint8 *data = ppp_option_iter_get_data(&iter);
150
150
                switch (ppp_option_iter_get_type(&iter)) {
151
151
                case ACCM:
152
 
                        ppp_set_xmit_accm(pppcp_get_ppp(pppcp), 0);
 
152
                        /*
 
153
                         * RFC1662 Section 7.1
 
154
                         * The Configuration Option is used to inform the peer
 
155
                         * which control characters MUST remain mapped when
 
156
                         * the peer sends them.
 
157
                         */
 
158
 
 
159
                        ppp_set_recv_accm(pppcp_get_ppp(pppcp),
 
160
                                        get_host_long(data));
153
161
                        break;
154
162
                default:
155
163
                        break;
263
271
        while (ppp_option_iter_next(&iter) == TRUE) {
264
272
                switch (ppp_option_iter_get_type(&iter)) {
265
273
                case ACCM:
266
 
                        ppp_set_recv_accm(ppp,
 
274
                        /*
 
275
                         * RFC1662 Section 7.1
 
276
                         * The Configuration Option is used to inform the peer
 
277
                         * which control characters MUST remain mapped when
 
278
                         * the peer sends them.
 
279
                         */
 
280
                        ppp_set_xmit_accm(ppp,
267
281
                                get_host_long(ppp_option_iter_get_data(&iter)));
268
282
                        break;
269
283
                case AUTH_PROTO: